diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-12-05 11:32:16 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-07 20:37:02 +0100 |
commit | ca16def26fa3352edbb642b918b59de1b2fa7fca (patch) | |
tree | f31c9253ed3875cc87907bf6938060e30e4af472 /sc/source/ui/view | |
parent | 522ed1b685f5b7eb52efb9d874dfacc02bf82139 (diff) |
rename ScEditEngineDefaulter::SetText
so its clear that it is not an override of baseclass EditEngine::SetText
Change-Id: I85ee9c9b212fe9248fb7e5fcb1ec83679ffb633d
Reviewed-on: https://gerrit.libreoffice.org/84553
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/output2.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/printfun.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/spelldialog.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/spelleng.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun4.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/viewfunc.cxx | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 9a4a3a18a491..46c47bd46ecd 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5256,7 +5256,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, if (aCell.meType == CELLTYPE_EDIT) { if (aCell.mpEditText) - pEngine->SetText(*aCell.mpEditText); + pEngine->SetTextCurrentDefaults(*aCell.mpEditText); } else // Not an Edit cell and is a formula cell with 'Hyperlink' // function if we have no URL, otherwise it could be a formula @@ -5278,7 +5278,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, } if (pTextObj) - pEngine->SetText(*pTextObj); + pEngine->SetTextCurrentDefaults(*pTextObj); } long nStartX = aLogicEdit.Left(); @@ -5360,9 +5360,9 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow pEngine->SetPaperSize(aPaperSize); if (aCell.meType == CELLTYPE_EDIT) - pEngine->SetText(*aCell.mpEditText); + pEngine->SetTextCurrentDefaults(*aCell.mpEditText); else - pEngine->SetText(aCell.mpString->getString()); + pEngine->SetTextCurrentDefaults(aCell.mpString->getString()); long nTextWidth = static_cast<long>(pEngine->CalcTextWidth()); @@ -5586,9 +5586,9 @@ bool ScGridWindow::ContinueOnlineSpelling() pEngine->SetDefaultItem(SvxLanguageItem(nCellLang, EE_CHAR_LANGUAGE)); if (eType == CELLTYPE_STRING) - pEngine->SetText(pCell->mpString->getString()); + pEngine->SetTextCurrentDefaults(pCell->mpString->getString()); else - pEngine->SetText(*pCell->mpEditText); + pEngine->SetTextCurrentDefaults(*pCell->mpEditText); aStatus.mbModified = false; pEngine->CompleteOnlineSpelling(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 823fa87d7d4e..b60977f95025 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1515,7 +1515,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) ); pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) ); pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CTL ) ); - pEditEng->SetText( aThisPageStr ); + pEditEng->SetTextCurrentDefaults( aThisPageStr ); Size aSize100( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() ); // 40% of width or 60% of height diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 41a9760cc450..b46c3d1ff642 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2341,7 +2341,7 @@ bool ScOutputData::DrawEditParam::readCellContent( const EditTextObject* pData = maCell.mpEditText; if (pData) { - mpEngine->SetText(*pData); + mpEngine->SetTextCurrentDefaults(*pData); if ( mbBreak && !mbAsianVertical && pData->HasField() ) { @@ -2370,7 +2370,7 @@ bool ScOutputData::DrawEditParam::readCellContent( bShowNullValues, bShowFormulas); - mpEngine->SetText(aString); + mpEngine->SetTextCurrentDefaults(aString); if ( pColor && !bSyntaxMode && !( bUseStyleColor && bForceAutoColor ) ) lcl_SetEditColor( *mpEngine, *pColor ); } @@ -2786,7 +2786,7 @@ private: long ScOutputData::SetEngineTextAndGetWidth( DrawEditParam& rParam, const OUString& rSetString, long& rNeededPixel, long nAddWidthPixels ) { - rParam.mpEngine->SetText( rSetString ); + rParam.mpEngine->SetTextCurrentDefaults( rSetString ); long nEngineWidth = static_cast<long>( rParam.mpEngine->CalcTextWidth() ); if ( rParam.mbPixelToLogic ) rNeededPixel = mpRefDevice->LogicToPixel( Size( nEngineWidth, 0 ) ).Width(); @@ -4677,7 +4677,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (aCell.meType == CELLTYPE_EDIT) { if (aCell.mpEditText) - pEngine->SetText(*aCell.mpEditText); + pEngine->SetTextCurrentDefaults(*aCell.mpEditText); else { OSL_FAIL("pData == 0"); @@ -4696,7 +4696,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) mbShowNullValues, mbShowFormulas); - pEngine->SetText(aString); + pEngine->SetTextCurrentDefaults(aString); if ( pColor && !mbSyntaxMode && !( mbUseStyleColor && mbForceAutoColor ) ) lcl_SetEditColor( *pEngine, *pColor ); } diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 03755bc8c48d..cf0add6a8b18 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -518,7 +518,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) pEditEng->SetDefaultItem(SvxFontHeightItem(nHeight, 100, EE_CHAR_FONTHEIGHT_CJK)); pEditEng->SetDefaultItem(SvxFontHeightItem(nHeight, 100, EE_CHAR_FONTHEIGHT_CTL)); - pEditEng->SetText(aEmptyMsg); + pEditEng->SetTextCurrentDefaults(aEmptyMsg); Point aCenter( (aWinEnd.X() - pEditEng->CalcTextWidth())/2, diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 18be8420c7ee..2b3760fbeeac 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1906,7 +1906,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, bool bDoPrint, ScPreviewLocationData if( const ScPostIt* pNote = pDoc->GetNote( rPos ) ) { if(const EditTextObject *pEditText = pNote->GetEditTextObject()) - pEditEngine->SetText(*pEditText); + pEditEngine->SetTextCurrentDefaults(*pEditText); long nTextHeight = pEditEngine->GetTextHeight(); if ( nPosY + nTextHeight < aPageRect.Bottom() ) { @@ -1917,7 +1917,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, bool bDoPrint, ScPreviewLocationData OUString aMarkStr(rPos.Format(ScRefFlags::VALID, pDoc, pDoc->GetAddressConvention()) + ":"); // cell position also via EditEngine, for correct positioning - pEditEngine->SetText(aMarkStr); + pEditEngine->SetTextCurrentDefaults(aMarkStr); pEditEngine->Draw( pDev, Point( aPageRect.Left(), nPosY ) ); } diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 4e48cf7698cb..21a459259f66 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -247,7 +247,7 @@ void ScSpellDialogChildWindow::Init() mxEngine->SetControlWord( EEControlBits::USECHARATTRIBS ); mxEngine->EnableUndo( false ); mxEngine->SetPaperSize( aRect.GetSize() ); - mxEngine->SetText( EMPTY_OUSTRING ); + mxEngine->SetTextCurrentDefaults( EMPTY_OUSTRING ); mxEngine->ClearModifyFlag(); mbNeedNextObj = true; diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index cc08e761e601..5035cd31a858 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -258,17 +258,17 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) Color* pColor; ScCellFormat::GetString(aCell, nNumFmt, aText, &pColor, *pFormatter, &mrDoc); - SetText(aText); + SetTextCurrentDefaults(aText); } break; case CELLTYPE_EDIT: { const EditTextObject* pNewEditObj = aCell.mpEditText; - SetText(*pNewEditObj); + SetTextCurrentDefaults(*pNewEditObj); } break; default: - SetText(EMPTY_OUSTRING); + SetTextCurrentDefaults(EMPTY_OUSTRING); } } diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 0b3166bedef4..e31e2f006ceb 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -860,7 +860,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat { const ScPatternAttr* pOldPattern = pDoc->GetPattern( nCol, nRow, nTab ); ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool(), pDoc ); - aEngine.SetText(*pData); + aEngine.SetTextCurrentDefaults(*pData); ScEditAttrTester aTester( &aEngine ); if (!aTester.NeedsObject()) diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 0778c2b5a710..135b621e6c4f 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -373,9 +373,9 @@ void ScViewFunc::DoThesaurus() } if (aOldText.meType == CELLTYPE_EDIT) - pThesaurusEngine->SetText(*aOldText.mpEditText); + pThesaurusEngine->SetTextCurrentDefaults(*aOldText.mpEditText); else - pThesaurusEngine->SetText(aOldText.getString(&rDoc)); + pThesaurusEngine->SetTextCurrentDefaults(aOldText.getString(&rDoc)); pEditView = GetViewData().GetEditView(GetViewData().GetActivePart()); if (pEditSel) @@ -532,7 +532,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam ) pEngine->SetControlWord( EEControlBits::USECHARATTRIBS ); pEngine->EnableUndo( false ); pEngine->SetPaperSize( aRect.GetSize() ); - pEngine->SetText( EMPTY_OUSTRING ); + pEngine->SetTextCurrentDefaults( EMPTY_OUSTRING ); // *** do the conversion *** ---------------------------------------------- diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index eb0f1935333b..344a43a644a9 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -654,7 +654,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr* pOldPattern = rDoc.GetPattern( nCol, nRow, nTab ); ScTabEditEngine aEngine( *pOldPattern, rDoc.GetEnginePool(), &rDoc ); - aEngine.SetText(rData); + aEngine.SetTextCurrentDefaults(rData); if (bTestSimple) // test, if simple string without attribute { |