diff options
Diffstat (limited to 'sc/source/ui')
23 files changed, 63 insertions, 63 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 392eb4b9af2a..0e9c174251c1 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -428,7 +428,7 @@ void ScAccessibleCell::FillPrecedents(utl::AccessibleRelationSetHelper* pRelatio return; ScRefCellValue aCell(*mpDoc, maCellAddress); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { ScFormulaCell* pCell = aCell.mpFormula; ScDetectiveRefIter aIter(*mpDoc, pCell); diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index d0be7e0aecc2..58723e438c72 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -312,7 +312,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt const ScPatternAttr* pPattern = m_pDoc->GetPattern( nCol, nRow, nTab ); ScTabEditEngine aEngine( *pPattern, m_pDoc->GetEditPool(), m_pDoc.get() ); ScRefCellValue aCell(*m_pDoc, aPos); - if (aCell.meType == CELLTYPE_EDIT) + if (aCell.getType() == CELLTYPE_EDIT) { const EditTextObject* pObj = aCell.mpEditText; aEngine.SetTextCurrentDefaults(*pObj); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index e46c3df81742..a5935402ba1d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2003,7 +2003,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt, // empty to fiddle with "sep=". if ((pCell = aIter.GetNext( nCol, nRow)) != nullptr && nCol == nStartCol && !aIter.GetNext( nCol, nRow)) { - if (pCell->meType == CELLTYPE_STRING) + if (pCell->getType() == CELLTYPE_STRING) { aString = pCell->mpString->getString(); if (aString.getLength() <= 5 && aString.startsWithIgnoreAsciiCase("sep=")) @@ -2101,7 +2101,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt, else nNextCol = nCol + 1; - CellType eType = pCell->meType; + CellType eType = pCell->getType(); ScAddress aPos(nCol, nRow, nTab); if ( bTabProtect ) { diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index edab7a5304b0..7ea21893a425 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -984,7 +984,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck OUString aValue = static_cast<const ScChangeActionContent*>(pSourceAction)->GetNewString( m_pDocument.get() ); ScMatrixMode eMatrix = ScMatrixMode::NONE; const ScCellValue& rCell = static_cast<const ScChangeActionContent*>(pSourceAction)->GetNewCell(); - if (rCell.meType == CELLTYPE_FORMULA) + if (rCell.getType() == CELLTYPE_FORMULA) eMatrix = rCell.mpFormula->GetMatrixFlag(); switch ( eMatrix ) { diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 683ac2cbe349..7974eb330d74 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -903,7 +903,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding ScRefCellValue aCell(*m_pDocument, ScAddress(nDocCol, nDocRow, nTab)); if (!aCell.isEmpty()) { - if (aCell.meType == CELLTYPE_EDIT) + if (aCell.getType() == CELLTYPE_EDIT) { // preserve paragraphs lcl_getLongVarCharEditString(aString, aCell, aEditEngine); } @@ -1009,7 +1009,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding { case sdbc::DataType::LONGVARCHAR: { - if (pCell->meType == CELLTYPE_EDIT) + if (pCell->getType() == CELLTYPE_EDIT) lcl_getLongVarCharEditString(aString, *pCell, aEditEngine); else lcl_getLongVarCharString( diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index a0f93781b0f5..6b9920245706 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1504,11 +1504,11 @@ static FormulaToken* convertToToken( ScDocument& rHostDoc, const ScDocument& rSr { if (rCell.hasEmptyValue()) { - bool bInherited = (rCell.meType == CELLTYPE_FORMULA); + bool bInherited = (rCell.getType() == CELLTYPE_FORMULA); return new ScEmptyCellToken(bInherited, false); } - switch (rCell.meType) + switch (rCell.getType()) { case CELLTYPE_EDIT: case CELLTYPE_STRING: @@ -2933,7 +2933,7 @@ public: { ScExternalRefCache::TokenRef pTok; ScRefCellValue aCell = mpCurCol->GetCellValue(maBlockPos, nRow); - switch (aCell.meType) + switch (aCell.getType()) { case CELLTYPE_STRING: case CELLTYPE_EDIT: diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6e6c57f44683..78fbe41cdd6d 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1942,7 +1942,7 @@ bool ScImportExport::Doc2Text( SvStream& rStrm ) SvNumberFormatter* pFormatter = rDoc.GetFormatTable(); ScRefCellValue aCell(rDoc, aPos, blockPos[ nCol - nStartCol ]); - switch (aCell.meType) + switch (aCell.getType()) { case CELLTYPE_FORMULA: { @@ -2382,7 +2382,7 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) SCROW r = nRow - nStartRow + 1; SCCOL c = nCol - nStartCol + 1; ScRefCellValue aCell(rDoc, ScAddress(nCol, nRow, aRange.aStart.Tab())); - CellType eType = aCell.meType; + CellType eType = aCell.getType(); switch( eType ) { case CELLTYPE_FORMULA: diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 8323cd824612..ff9520c47768 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -449,7 +449,7 @@ void ScUndoSetCell::SetValue( const ScCellValue& rVal ) { ScDocument& rDoc = pDocShell->GetDocument(); - switch (rVal.meType) + switch (rVal.getType()) { case CELLTYPE_NONE: // empty cell diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index b2117cefccf8..14974b4beea3 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1329,7 +1329,7 @@ static OUString lcl_GetInputString( ScDocument& rDoc, const ScAddress& rPos, boo OUString aVal; - CellType eType = aCell.meType; + CellType eType = aCell.getType(); if (eType == CELLTYPE_FORMULA) { ScFormulaCell* pForm = aCell.mpFormula; @@ -4800,7 +4800,7 @@ OUString SAL_CALL ScCellRangeObj::getArrayFormula() ScDocument& rDoc = pDocSh->GetDocument(); ScRefCellValue aCell1(rDoc, aRange.aStart); ScRefCellValue aCell2(rDoc, aRange.aEnd); - if (aCell1.meType == CELLTYPE_FORMULA && aCell2.meType == CELLTYPE_FORMULA) + if (aCell1.getType() == CELLTYPE_FORMULA && aCell2.getType() == CELLTYPE_FORMULA) { const ScFormulaCell* pFCell1 = aCell1.mpFormula; const ScFormulaCell* pFCell2 = aCell2.mpFormula; @@ -4864,7 +4864,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() ScDocument& rDoc = pDocSh->GetDocument(); ScRefCellValue aCell1(rDoc, aRange.aStart); ScRefCellValue aCell2(rDoc, aRange.aEnd); - if (aCell1.meType == CELLTYPE_FORMULA && aCell2.meType == CELLTYPE_FORMULA) + if (aCell1.getType() == CELLTYPE_FORMULA && aCell2.getType() == CELLTYPE_FORMULA) { const ScFormulaCell* pFCell1 = aCell1.mpFormula; const ScFormulaCell* pFCell2 = aCell2.mpFormula; @@ -6159,7 +6159,7 @@ void SAL_CALL ScCellObj::setFormulaResult( double nValue ) if (pDocSh) { ScRefCellValue aCell(pDocSh->GetDocument(), aCellPos); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { ScFormulaCell* pCell = aCell.mpFormula; pCell->SetHybridDouble( nValue ); @@ -6243,7 +6243,7 @@ table::CellContentType ScCellObj::GetContentType_Impl() if ( pDocSh ) { ScRefCellValue aCell(pDocSh->GetDocument(), aCellPos); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { bool bValue = aCell.mpFormula->IsValue(); return bValue ? table::CellContentType_VALUE : table::CellContentType_TEXT; @@ -6264,7 +6264,7 @@ sal_Int32 SAL_CALL ScCellObj::getError() FormulaError nError = FormulaError::NONE; ScRefCellValue aCell(pDocSh->GetDocument(), aCellPos); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) nError = aCell.mpFormula->GetErrCode(); return static_cast<sal_Int32>(nError); @@ -6282,7 +6282,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() ScDocument& rDoc = pDocSh->GetDocument(); ScRefCellValue aCell(rDoc, aCellPos); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { ScTokenArray* pTokenArray = aCell.mpFormula->GetCode(); if (pTokenArray) diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index d2fec774e125..50ee015adfb1 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2550,7 +2550,7 @@ void ScChart2DataSequence::BuildDataCache() aItem.maString = m_pDocument->GetString(aAdr); ScRefCellValue aCell(*m_pDocument, aAdr, hint); - switch (aCell.meType) + switch (aCell.getType()) { case CELLTYPE_VALUE: aItem.mfValue = aCell.getValue(); diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 46ec6dbf2fbd..413bb3e3685e 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -815,7 +815,7 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder() } ScRefCellValue aCell(rDoc, aCellPos); - if (aCell.meType == CELLTYPE_EDIT) + if (aCell.getType() == CELLTYPE_EDIT) { const EditTextObject* pObj = aCell.mpEditText; pEditEngine->SetTextNewDefaults(*pObj, aDefaults); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 17c4936567f9..30a796e9f646 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -3428,7 +3428,7 @@ void ScCellShell::ExecuteFillSingleEdit() aPrevPos.IncRow(-1); ScRefCellValue aCell(rDoc, aPrevPos); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { aInit = "="; const ScTokenArray* pCode = aCell.mpFormula->GetCode(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0a5a8454c8ec..753b79763038 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.meType == CELLTYPE_FORMULA && aCell.mpFormula->GetMatrixOrigin(rDoc, aPos) && aPos == rRange.aStart); + return (aCell.getType() == CELLTYPE_FORMULA && aCell.mpFormula->GetMatrixOrigin(rDoc, aPos) && aPos == rRange.aStart); } static void lcl_UnLockComment( ScDrawView* pView, const Point& rPos, const ScViewData& rViewData ) @@ -333,9 +333,9 @@ static bool lcl_GetHyperlinkCell( rURL = pPattern->GetItem(ATTR_HYPERLINK).GetValue(); bFound = true; } - else if (rCell.meType == CELLTYPE_EDIT) + else if (rCell.getType() == CELLTYPE_EDIT) bFound = true; - else if (rCell.meType == CELLTYPE_FORMULA && rCell.mpFormula->IsHyperLinkCell()) + else if (rCell.getType() == CELLTYPE_FORMULA && rCell.mpFormula->IsHyperLinkCell()) bFound = true; else return false; // other cell @@ -3236,7 +3236,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) // Find the first string to the left for spell checking in case the current cell is empty. ScAddress aPos(nCellX, nCellY, nTab); ScRefCellValue aSpellCheckCell(rDoc, aPos); - while (!bPosIsInEditView && aSpellCheckCell.meType == CELLTYPE_NONE) + while (!bPosIsInEditView && aSpellCheckCell.getType() == CELLTYPE_NONE) { // Loop until we get the first non-empty cell in the row. aPos.IncCol(-1); @@ -3246,7 +3246,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) aSpellCheckCell.assign(rDoc, aPos); } - if (aPos.Col() >= 0 && (aSpellCheckCell.meType == CELLTYPE_STRING || aSpellCheckCell.meType == CELLTYPE_EDIT)) + if (aPos.Col() >= 0 && (aSpellCheckCell.getType() == CELLTYPE_STRING || aSpellCheckCell.getType() == CELLTYPE_EDIT)) nColSpellError = aPos.Col(); // Is there a misspelled word somewhere in the cell? @@ -5704,7 +5704,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, tools::Rectangle aLogicEdit = PixelToLogic( aEditRect, aEditMode ); tools::Long nThisColLogic = aLogicEdit.Right() - aLogicEdit.Left() + 1; Size aPaperSize( 1000000, 1000000 ); - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { tools::Long nSizeX = 0; tools::Long nSizeY = 0; @@ -5718,7 +5718,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, pEngine->SetPaperSize( aPaperSize ); std::unique_ptr<EditTextObject> pTextObj; - if (aCell.meType == CELLTYPE_EDIT) + if (aCell.getType() == CELLTYPE_EDIT) { if (aCell.mpEditText) pEngine->SetTextCurrentDefaults(*aCell.mpEditText); @@ -5736,7 +5736,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, // TODO: text content of formatted numbers can be different if (aCell.hasNumeric()) aRepres = OUString::number(aCell.getValue()); - else if (aCell.meType == CELLTYPE_FORMULA) + else if (aCell.getType() == CELLTYPE_FORMULA) aRepres = aCell.mpFormula->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 38417d000be5..a9bdc4c3baef 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1834,7 +1834,7 @@ void ScOutputData::FindChanged() { const ScRefCellValue& rCell = pThisRowInfo->cellInfo(nX).maCell; - if (rCell.meType != CELLTYPE_FORMULA) + if (rCell.getType() != CELLTYPE_FORMULA) continue; ScFormulaCell* pFCell = rCell.mpFormula; @@ -1883,7 +1883,7 @@ void ScOutputData::FindChanged() { const ScRefCellValue& rCell = pThisRowInfo->cellInfo(nX).maCell; - if (rCell.meType != CELLTYPE_FORMULA) + if (rCell.getType() != CELLTYPE_FORMULA) continue; ScFormulaCell* pFCell = rCell.mpFormula; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index cdd9329d3fcb..a66ce5b80d78 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -491,7 +491,7 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt static bool SameValue( const ScRefCellValue& rCell, const ScRefCellValue& rOldCell ) { - return rOldCell.meType == CELLTYPE_VALUE && rCell.meType == CELLTYPE_VALUE && + return rOldCell.getType() == CELLTYPE_VALUE && rCell.getType() == CELLTYPE_VALUE && rCell.mfValue == rOldCell.mfValue; } @@ -604,7 +604,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScRefCellValue& rCell, tools::Long if (bPixelToLogic) nWidth = pOutput->mpRefDevice->PixelToLogic(Size(nWidth,0)).Width(); - CellType eType = rCell.meType; + CellType eType = rCell.getType(); if (eType != CELLTYPE_VALUE && eType != CELLTYPE_FORMULA) // must be a value or formula cell. return; @@ -862,7 +862,7 @@ static void lcl_DoHyperlinkResult( const OutputDevice* pDev, const tools::Rectan vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >( pDev->GetExtOutDevData() ); OUString aURL; - if (rCell.meType == CELLTYPE_FORMULA) + if (rCell.getType() == CELLTYPE_FORMULA) { ScFormulaCell* pFCell = rCell.mpFormula; OUString aCellText; @@ -882,7 +882,7 @@ static void lcl_DoHyperlinkResult( const OutputDevice* pDev, const tools::Rectan void ScOutputData::SetSyntaxColor( vcl::Font* pFont, const ScRefCellValue& rCell ) { - switch (rCell.meType) + switch (rCell.getType()) { case CELLTYPE_VALUE: pFont->SetColor(*mxValueColor); @@ -912,7 +912,7 @@ static void lcl_SetEditColor( EditEngine& rEngine, const Color& rColor ) void ScOutputData::SetEditSyntaxColor( EditEngine& rEngine, const ScRefCellValue& rCell ) { Color aColor; - switch (rCell.meType) + switch (rCell.getType()) { case CELLTYPE_VALUE: aColor = *mxValueColor; @@ -1630,12 +1630,12 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co GetVisibleCell( nCellX, nCellY, nTab, aCell ); // get from document if (aCell.isEmpty()) bDoCell = false; - else if (aCell.meType == CELLTYPE_EDIT) + else if (aCell.getType() == CELLTYPE_EDIT) bUseEditEngine = true; } // Check if this cell is mis-spelled. - if (bDoCell && !bUseEditEngine && aCell.meType == CELLTYPE_STRING) + if (bDoCell && !bUseEditEngine && aCell.getType() == CELLTYPE_STRING) { if (mpSpellCheckCxt && mpSpellCheckCxt->isMisspelled(nCellX, nCellY)) bUseEditEngine = true; @@ -1722,7 +1722,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co } if (bDoCell && !bUseEditEngine) { - bool bFormulaCell = (aCell.meType == CELLTYPE_FORMULA); + bool bFormulaCell = (aCell.getType() == CELLTYPE_FORMULA); if ( bFormulaCell ) lcl_CreateInterpretProgress(bProgress, mpDoc, aCell.mpFormula); if ( aVars.SetText(aCell) ) @@ -1733,7 +1733,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co SvxCellHorJustify eOutHorJust = SvxCellHorJustify::Standard; if (bDoCell && !bUseEditEngine) { - CellType eCellType = aCell.meType; + CellType eCellType = aCell.getType(); bCellIsValue = ( eCellType == CELLTYPE_VALUE ); if ( eCellType == CELLTYPE_FORMULA ) { @@ -2130,7 +2130,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co } // PDF: whole-cell hyperlink from formula? - bool bHasURL = pPDFData && aCell.meType == CELLTYPE_FORMULA && aCell.mpFormula->IsHyperLinkCell(); + bool bHasURL = pPDFData && aCell.getType() == CELLTYPE_FORMULA && aCell.mpFormula->IsHyperLinkCell(); if (bPaint && bHasURL) { tools::Rectangle aURLRect( aURLStart, aVars.GetTextSize() ); @@ -2186,7 +2186,7 @@ static void lcl_ClearEdit( EditEngine& rEngine ) // text and attributes static bool lcl_SafeIsValue( ScRefCellValue& rCell ) { - switch (rCell.meType) + switch (rCell.getType()) { case CELLTYPE_VALUE: return true; @@ -2378,7 +2378,7 @@ ScOutputData::DrawEditParam::DrawEditParam(const ScPatternAttr* pPattern, const bool ScOutputData::DrawEditParam::readCellContent( const ScDocument* pDoc, bool bShowNullValues, bool bShowFormulas, bool bSyntaxMode, bool bUseStyleColor, bool bForceAutoColor, bool& rWrapFields) { - if (maCell.meType == CELLTYPE_EDIT) + if (maCell.getType() == CELLTYPE_EDIT) { const EditTextObject* pData = maCell.mpEditText; if (pData) @@ -2556,7 +2556,7 @@ bool ScOutputData::DrawEditParam::hasLineBreak() const bool ScOutputData::DrawEditParam::isHyperlinkCell() const { - if (maCell.meType != CELLTYPE_FORMULA) + if (maCell.getType() != CELLTYPE_FORMULA) return false; return maCell.mpFormula->IsHyperLinkCell(); @@ -2694,7 +2694,7 @@ void ScOutputData::DrawEditParam::setAlignmentToEngine() } mpEngine->SetVertical(mbAsianVertical); - if (maCell.meType == CELLTYPE_EDIT) + if (maCell.getType() == CELLTYPE_EDIT) { // We need to synchronize the vertical mode in the EditTextObject // instance too. No idea why we keep this state in two separate @@ -4730,7 +4730,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) // read data from cell - if (aCell.meType == CELLTYPE_EDIT) + if (aCell.getType() == CELLTYPE_EDIT) { if (aCell.mpEditText) pEngine->SetTextCurrentDefaults(*aCell.mpEditText); diff --git a/sc/source/ui/view/spellcheckcontext.cxx b/sc/source/ui/view/spellcheckcontext.cxx index 1d39fe5125da..3f0d917126cf 100644 --- a/sc/source/ui/view/spellcheckcontext.cxx +++ b/sc/source/ui/view/spellcheckcontext.cxx @@ -74,7 +74,7 @@ public: bool query(SCCOL nCol, SCROW nRow, const ScRefCellValue& rCell, MisspellType*& rpRanges) const { - CellType eType = rCell.meType; + CellType eType = rCell.getType(); if (eType == CELLTYPE_STRING) { SharedStringMapType::const_iterator it = maStringMisspells.find(rCell.mpString->getData()); @@ -101,7 +101,7 @@ public: void set(SCCOL nCol, SCROW nRow, const ScRefCellValue& rCell, std::unique_ptr<MisspellType> pRanges) { - CellType eType = rCell.meType; + CellType eType = rCell.getType(); if (eType == CELLTYPE_STRING) maStringMisspells.insert_or_assign(rCell.mpString->getData(), std::move(pRanges)); else if (eType == CELLTYPE_EDIT) @@ -234,7 +234,7 @@ void SpellCheckContext::setMisspellRanges( reset(); ScRefCellValue aCell(*pDoc, ScAddress(nCol, nRow, mnTab)); - CellType eType = aCell.meType; + CellType eType = aCell.getType(); if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT) return; @@ -281,7 +281,7 @@ void SpellCheckContext::ensureResults(SCCOL nCol, SCROW nRow) } ScRefCellValue aCell(*pDoc, ScAddress(nCol, nRow, mnTab)); - CellType eType = aCell.meType; + CellType eType = aCell.getType(); if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT) { diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index cb3c4f4ad974..db5fa22303f4 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -277,7 +277,7 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) ScAddress aPos(nCol, nRow, nTab); ScRefCellValue aCell(mrDoc, aPos); - switch (aCell.meType) + switch (aCell.getType()) { case CELLTYPE_STRING: { diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index 669c7554f3bd..666d07a66fc7 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -110,7 +110,7 @@ OUString ScTabViewShell::GetFormula(const ScAddress& rAddress) { ScDocument& rDoc = GetViewData().GetDocument(); ScRefCellValue aCell(rDoc, rAddress); - if (!aCell.isEmpty() && aCell.meType == CELLTYPE_FORMULA) + if (!aCell.isEmpty() && aCell.getType() == CELLTYPE_FORMULA) { return aCell.mpFormula->GetFormula(); } diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index ae0b86f86541..36228c3a7b25 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -321,7 +321,7 @@ std::unique_ptr<SvxNumberInfoItem> ScTabViewShell::MakeNumberInfoItem( ScDocumen ScRefCellValue aCell(rDoc, rViewData.GetCurPos()); - switch (aCell.meType) + switch (aCell.getType()) { case CELLTYPE_VALUE: { diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 99877fdaf589..f02c0dec9aa6 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -705,12 +705,12 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bSt if (!bHideAll) { ScRefCellValue rCell(rDoc, aPos); - if (rCell.meType == CELLTYPE_FORMULA) + if (rCell.getType() == CELLTYPE_FORMULA) { if (!bHideFormula) aString = rCell.mpFormula->GetFormula(); } - else if (rCell.meType == CELLTYPE_EDIT) + else if (rCell.getType() == CELLTYPE_EDIT) { pObject = rCell.mpEditText; } @@ -720,7 +720,7 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bSt sal_uInt32 nNumFmt = rDoc.GetNumberFormat( aPos ); aString = ScCellFormat::GetInputString( rCell, nNumFmt, *pFormatter, rDoc ); - if (rCell.meType == CELLTYPE_STRING) + if (rCell.getType() == CELLTYPE_STRING) { // Put a ' in front if necessary, so that the string is not // unintentionally interpreted as a number, and to show the diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 7fe941e33dd6..16230b5a17a6 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -274,7 +274,7 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument& rDoc, SCCOL nCol, SCROW nRow, ScRefCellValue aCell(rDoc, ScAddress(nCol, nRow, nTab)); if (aCell.hasNumeric()) { - if (aCell.meType == CELLTYPE_FORMULA) + if (aCell.getType() == CELLTYPE_FORMULA) { ScAutoSum val = ScAutoSumNone; ScTokenArray* pCode = aCell.mpFormula->GetCode(); diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 024b11e3be2d..afc5dd00e1d7 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -349,7 +349,7 @@ void ScViewFunc::DoThesaurus() ScCellValue aOldText; aOldText.assign(rDoc, aPos); - if (aOldText.meType != CELLTYPE_STRING && aOldText.meType != CELLTYPE_EDIT) + if (aOldText.getType() != CELLTYPE_STRING && aOldText.getType() != CELLTYPE_EDIT) { ErrorMessage(STR_THESAURUS_NO_STRING); return; @@ -370,7 +370,7 @@ void ScViewFunc::DoThesaurus() pThesaurusEngine->SetDefaults( aEditDefaults ); } - if (aOldText.meType == CELLTYPE_EDIT) + if (aOldText.getType() == CELLTYPE_EDIT) pThesaurusEngine->SetTextCurrentDefaults(*aOldText.mpEditText); else pThesaurusEngine->SetTextCurrentDefaults(aOldText.getString(rDoc)); @@ -402,7 +402,7 @@ void ScViewFunc::DoThesaurus() { ScCellValue aNewText; - if (aOldText.meType == CELLTYPE_EDIT) + if (aOldText.getType() == CELLTYPE_EDIT) { // The cell will own the text object instance. std::unique_ptr<EditTextObject> pText = pThesaurusEngine->CreateTextObject(); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index cd886c976c88..4046b212120f 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1264,7 +1264,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, bool bCursor std::unique_ptr<EditTextObject> pNewEditData; ScAddress aPos(nCol, nRow, nTab); ScRefCellValue aCell(rDoc, aPos); - if (aCell.meType == CELLTYPE_EDIT) + if (aCell.getType() == CELLTYPE_EDIT) { const EditTextObject* pEditObj = aCell.mpEditText; pOldEditData = pEditObj->Clone(); |