summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-05 11:32:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-12-07 20:37:02 +0100
commitca16def26fa3352edbb642b918b59de1b2fa7fca (patch)
treef31c9253ed3875cc87907bf6938060e30e4af472 /sc/source/ui
parent522ed1b685f5b7eb52efb9d874dfacc02bf82139 (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')
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx6
-rw-r--r--sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx16
-rw-r--r--sc/source/ui/app/inputwin.cxx4
-rw-r--r--sc/source/ui/app/transobj.cxx6
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx2
-rw-r--r--sc/source/ui/docshell/docsh8.cxx2
-rw-r--r--sc/source/ui/docshell/impex.cxx4
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx28
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx2
-rw-r--r--sc/source/ui/undo/undoblk3.cxx2
-rw-r--r--sc/source/ui/unoobj/editsrc.cxx2
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx2
-rw-r--r--sc/source/ui/unoobj/textuno.cxx8
-rw-r--r--sc/source/ui/view/gridwin.cxx12
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/output2.cxx10
-rw-r--r--sc/source/ui/view/preview.cxx2
-rw-r--r--sc/source/ui/view/printfun.cxx4
-rw-r--r--sc/source/ui/view/spelldialog.cxx2
-rw-r--r--sc/source/ui/view/spelleng.cxx6
-rw-r--r--sc/source/ui/view/viewfun2.cxx2
-rw-r--r--sc/source/ui/view/viewfun4.cxx6
-rw-r--r--sc/source/ui/view/viewfunc.cxx2
25 files changed, 68 insertions, 68 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 0c167403cac6..8cfc3a297979 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1060,7 +1060,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
aSize = pWindow->PixelToLogic(aSize, pEditEngine->GetRefMapMode());
pEditEngine->SetPaperSize(aSize);
}
- pEditEngine->SetText( maText );
+ pEditEngine->SetTextCurrentDefaults( maText );
}
bDataValid = true;
@@ -1179,7 +1179,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
mpEditEngine->SetPaperSize(aSize);
}
if (mpEditObj)
- mpEditEngine->SetText(*mpEditObj);
+ mpEditEngine->SetTextCurrentDefaults(*mpEditObj);
mbDataValid = true;
return mpForwarder.get();
@@ -1278,7 +1278,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
aSize = pWindow->PixelToLogic(aSize, mpEditEngine->GetRefMapMode());
mpEditEngine->SetPaperSize(aSize);
}
- mpEditEngine->SetText( msText );
+ mpEditEngine->SetTextCurrentDefaults( msText );
}
mbDataValid = true;
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index a27598441330..4ac9ee4d2f76 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -210,7 +210,7 @@ void AddressWalkerWriter::writeString(const char* aCharArray)
void AddressWalkerWriter::writeBoldString(const OUString& aString)
{
ScFieldEditEngine& rEngine = mpDocument->GetEditEngine();
- rEngine.SetText(aString);
+ rEngine.SetTextCurrentDefaults(aString);
SfxItemSet aItemSet = rEngine.GetEmptyItemSet();
SvxWeightItem aWeight(WEIGHT_BOLD, EE_CHAR_WEIGHT);
aItemSet.Put(aWeight);
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e8c8ebd0c669..9e9008f5c111 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2332,7 +2332,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
OUString aStr;
if (bTextValid)
{
- mpEditEngine->SetText(aCurrentText);
+ mpEditEngine->SetTextCurrentDefaults(aCurrentText);
aStr = aCurrentText;
bTextValid = false;
aCurrentText.clear();
@@ -2343,7 +2343,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
if (aStr.startsWith("{=") && aStr.endsWith("}") ) // Matrix formula?
{
aStr = aStr.copy(1, aStr.getLength() -2);
- mpEditEngine->SetText(aStr);
+ mpEditEngine->SetTextCurrentDefaults(aStr);
if ( pInputWin )
pInputWin->SetTextString(aStr);
}
@@ -2711,7 +2711,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode, const OUString* pInitText, S
if (pInitText)
{
- mpEditEngine->SetText(*pInitText);
+ mpEditEngine->SetTextCurrentDefaults(*pInitText);
bModified = true;
}
@@ -3195,7 +3195,7 @@ void ScInputHandler::CancelHandler()
pExecuteSh->StopEditShell();
aCursorPos.Set(pExecuteSh->GetViewData().GetDocument()->MaxCol()+1,0,0); // Invalid flag
- mpEditEngine->SetText(OUString());
+ mpEditEngine->SetTextCurrentDefaults(OUString());
if ( !pLastState && pExecuteSh )
pExecuteSh->UpdateInputHandler( true ); // Update status again
@@ -3881,7 +3881,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
{
if (pData)
{
- mpEditEngine->SetText( *pData );
+ mpEditEngine->SetTextCurrentDefaults( *pData );
if (pInputWin)
aString = ScEditUtil::GetMultilineString(*mpEditEngine);
else
@@ -4027,7 +4027,7 @@ IMPL_LINK_NOARG( ScInputHandler, DelayTimer, Timer*, void )
bInOwnChange = true; // disable ModifyHdl (reset below)
pActiveViewSh = nullptr;
- mpEditEngine->SetText( EMPTY_OUSTRING );
+ mpEditEngine->SetTextCurrentDefaults( EMPTY_OUSTRING );
if ( pInputWin )
{
pInputWin->SetPosString( EMPTY_OUSTRING );
@@ -4059,7 +4059,7 @@ void ScInputHandler::InputChanged( const EditView* pView, bool bFromNotify )
bool bNewView = DataChanging(); //FIXME: Is this at all possible?
aCurrentText = pView->GetEditEngine()->GetText(); // Also remember the string
- mpEditEngine->SetText( aCurrentText );
+ mpEditEngine->SetTextCurrentDefaults( aCurrentText );
DataChanged( bFromTopNotify );
bTextValid = true; // Is set to false in DataChanged
@@ -4109,7 +4109,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
{
// Copy content
std::unique_ptr<EditTextObject> pObj = mpEditEngine->CreateTextObject();
- rDestEngine.SetText(*pObj);
+ rDestEngine.SetTextCurrentDefaults(*pObj);
pObj.reset();
// Delete attributes
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d3c254ddd518..8ea768eca7e1 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1389,7 +1389,7 @@ void ScTextWnd::InitEditEngine()
if (bFilled && mpEditEngine->GetText() == aString)
Invalidate(); // Repaint for (filled) Field
else
- mpEditEngine->SetText(aString); // At least the right text then
+ mpEditEngine->SetTextCurrentDefaults(aString); // At least the right text then
mpEditView = std::make_unique<EditView>(mpEditEngine.get(), this);
mpEditView->SetInsertMode(bIsInsertMode);
@@ -1847,7 +1847,7 @@ void ScTextWnd::SetTextString( const OUString& rNewString )
}
else
{
- mpEditEngine->SetText(rNewString);
+ mpEditEngine->SetTextCurrentDefaults(rNewString);
}
aString = rNewString;
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 88f80d77f272..dd11e67c0f42 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
if (aCell.meType == CELLTYPE_EDIT)
{
const EditTextObject* pObj = aCell.mpEditText;
- aEngine.SetText(*pObj);
+ aEngine.SetTextCurrentDefaults(*pObj);
}
else
{
@@ -322,7 +322,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
Color* pColor;
ScCellFormat::GetString(aCell, nNumFmt, aText, &pColor, *pFormatter, m_pDoc.get());
if (!aText.isEmpty())
- aEngine.SetText(aText);
+ aEngine.SetTextCurrentDefaults(aText);
}
bOK = SetObject( &aEngine,
@@ -900,7 +900,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
if ( pFCell->IsMultilineResult() )
{
ScFieldEditEngine& rEngine = pDestDoc->GetEditEngine();
- rEngine.SetText(aStr);
+ rEngine.SetTextCurrentDefaults(aStr);
pDestDoc->SetEditText(ScAddress(nCol,nRow,nDestTab), rEngine.CreateTextObject());
}
else
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 5d3500097e24..f4e4698fee1b 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1123,7 +1123,7 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos, const OUString& rText )
if( !aToken.isEmpty() )
{
sal_Int32 nX = rPos.X() + GetCharWidth() * nBeginIx;
- mpEditEngine->SetText( aToken );
+ mpEditEngine->SetTextCurrentDefaults( aToken );
mpEditEngine->Draw( mpBackgrDev.get(), Point( nX, rPos.Y() ) );
}
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index caad14cffb01..330b5b45e481 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -966,7 +966,7 @@ bool ScDocFunc::SetStringOrEditCell( const ScAddress& rPos, const OUString& rStr
if (ScStringUtil::isMultiline(rStr))
{
ScFieldEditEngine& rEngine = rDoc.GetEditEngine();
- rEngine.SetText(rStr);
+ rEngine.SetTextCurrentDefaults(rStr);
std::unique_ptr<EditTextObject> pEditText(rEngine.CreateTextObject());
return SetEditCell(rPos, *pEditText, bInteraction);
}
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index dae548543955..0dc7570d6d54 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -710,7 +710,7 @@ void lcl_getLongVarCharEditString( OUString& rString,
if (!rCell.mpEditText)
return;
- rEditEngine.SetText(*rCell.mpEditText);
+ rEditEngine.SetTextCurrentDefaults(*rCell.mpEditText);
rString = rEditEngine.GetText( LINEEND_CRLF );
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 317fc2e0d642..5b115f5bd276 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -998,7 +998,7 @@ static bool lcl_PutString(
if(ScStringUtil::isMultiline(rStr))
{
ScFieldEditEngine& rEngine = pDoc->GetEditEngine();
- rEngine.SetText(rStr);
+ rEngine.SetTextCurrentDefaults(rStr);
rDocImport.setEditCell(ScAddress(nCol, nRow, nTab), rEngine.CreateTextObject());
return true;
}
@@ -1246,7 +1246,7 @@ static bool lcl_PutString(
{
bMultiLine = true;
ScFieldEditEngine& rEngine = pDoc->GetEditEngine();
- rEngine.SetText(rStr);
+ rEngine.SetTextCurrentDefaults(rStr);
if ( bUseDocImport )
rDocImport.setEditCell(ScAddress(nCol, nRow, nTab), rEngine.CreateTextObject());
else
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index f0fb8dab9071..af74df3d718e 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -523,7 +523,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
ClearTextAreas();
OUString aPageEntry( m_xFtPage->get_label() + " " );
- m_xWndCenter->GetEditEngine()->SetText(aPageEntry);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
m_xWndCenter->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) );
if(!bTravelling)
m_xWndCenter->GrabFocus();
@@ -535,7 +535,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
ClearTextAreas();
ESelection aSel(0,0,0,0);
OUString aPageEntry( m_xFtPage->get_label() + " ");
- m_xWndCenter->GetEditEngine()->SetText(aPageEntry);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
aSel.nEndPos = aPageEntry.getLength();
m_xWndCenter->GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
++aSel.nEndPos;
@@ -562,11 +562,11 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
ClearTextAreas();
OUString aConfidentialEntry(aUserOpt.GetCompany() + " " + m_xFtConfidential->get_label());
- m_xWndLeft->GetEditEngine()->SetText(aConfidentialEntry);
+ m_xWndLeft->GetEditEngine()->SetTextCurrentDefaults(aConfidentialEntry);
m_xWndCenter->InsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SvxDateType::Var), EE_FEATURE_FIELD) );
OUString aPageEntry( m_xFtPage->get_label() + " ");
- m_xWndRight->GetEditEngine()->SetText(aPageEntry);
+ m_xWndRight->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
m_xWndRight->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) );
if(!bTravelling)
m_xWndRight->GrabFocus();
@@ -604,7 +604,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
ClearTextAreas();
ESelection aSel(0,0,0,0);
OUString aPageEntry( m_xFtPage->get_label() + " " );
- m_xWndCenter->GetEditEngine()->SetText(aPageEntry);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
aSel.nEndPos = aPageEntry.getLength();
m_xWndCenter->GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
++aSel.nEndPos;
@@ -625,7 +625,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
ClearTextAreas();
ESelection aSel(0,0,0,0);
OUString aPageEntry( m_xFtPage->get_label() + " " );
- m_xWndCenter->GetEditEngine()->SetText(aPageEntry);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
aSel.nEndPos = aPageEntry.getLength();
m_xWndCenter->GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
++aSel.nEndPos;
@@ -644,7 +644,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
ClearTextAreas();
OUString aPageEntry( m_xFtPage->get_label() + " " );
- m_xWndCenter->GetEditEngine()->SetText(aPageEntry);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
m_xWndCenter->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) );
m_xWndRight->InsertField( SvxFieldItem( SvxExtFileField(
EMPTY_OUSTRING, SvxFileType::Var, SvxFileFormat::PathFull ), EE_FEATURE_FIELD ) );
@@ -657,10 +657,10 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
ClearTextAreas();
OUString aUserNameEntry(aUserOpt.GetFirstName() + " " + aUserOpt.GetLastName());
- m_xWndLeft->GetEditEngine()->SetText(aUserNameEntry);
+ m_xWndLeft->GetEditEngine()->SetTextCurrentDefaults(aUserNameEntry);
OUString aPageEntry( m_xFtPage->get_label() + " ");
//aPageEntry += " ";
- m_xWndCenter->GetEditEngine()->SetText(aPageEntry);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
m_xWndCenter->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) );
m_xWndRight->InsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SvxDateType::Var), EE_FEATURE_FIELD) );
if(!bTravelling)
@@ -672,10 +672,10 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
ClearTextAreas();
OUString aCreatedByEntry( m_xFtCreatedBy->get_label() + " " + aUserOpt.GetFirstName() + " " + aUserOpt.GetLastName());
- m_xWndLeft->GetEditEngine()->SetText(aCreatedByEntry);
+ m_xWndLeft->GetEditEngine()->SetTextCurrentDefaults(aCreatedByEntry);
m_xWndCenter->InsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SvxDateType::Var), EE_FEATURE_FIELD) );
OUString aPageEntry( m_xFtPage->get_label() + " " );
- m_xWndRight->GetEditEngine()->SetText(aPageEntry);
+ m_xWndRight->GetEditEngine()->SetTextCurrentDefaults(aPageEntry);
m_xWndRight->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) );
if(!bTravelling)
m_xWndRight->GrabFocus();
@@ -689,11 +689,11 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
void ScHFEditPage::ClearTextAreas()
{
- m_xWndLeft->GetEditEngine()->SetText(EMPTY_OUSTRING);
+ m_xWndLeft->GetEditEngine()->SetTextCurrentDefaults(EMPTY_OUSTRING);
m_xWndLeft->Invalidate();
- m_xWndCenter->GetEditEngine()->SetText(EMPTY_OUSTRING);
+ m_xWndCenter->GetEditEngine()->SetTextCurrentDefaults(EMPTY_OUSTRING);
m_xWndCenter->Invalidate();
- m_xWndRight->GetEditEngine()->SetText(EMPTY_OUSTRING);
+ m_xWndRight->GetEditEngine()->SetTextCurrentDefaults(EMPTY_OUSTRING);
m_xWndRight->Invalidate();
}
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 43a76c361c32..16954e793fbc 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -160,7 +160,7 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern )
void ScEditWindow::SetText( const EditTextObject& rTextObject )
{
- GetEditEngine()->SetText( rTextObject );
+ GetEditEngine()->SetTextCurrentDefaults(rTextObject);
}
void ScEditWindow::InsertField( const SvxFieldItem& rFld )
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 9f7772ce07cf..4e8add1ee461 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1025,7 +1025,7 @@ void ScUndoReplace::Undo()
if ( aUndoStr.indexOf('\n') != -1 )
{
ScFieldEditEngine& rEngine = rDoc.GetEditEngine();
- rEngine.SetText(aUndoStr);
+ rEngine.SetTextCurrentDefaults(aUndoStr);
rDoc.SetEditText(aCursorPos, rEngine.CreateTextObject());
}
else
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 07199891dd9f..4c0969130b95 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
if ( pDocShell )
if ( ScPostIt* pNote = pDocShell->GetDocument().GetNote(aCellPos) )
if ( const EditTextObject* pEditObj = pNote->GetEditTextObject() )
- pEditEngine->SetText( *pEditObj ); // incl. breaks (line, etc.)
+ pEditEngine->SetTextCurrentDefaults( *pEditObj ); // incl. breaks (line, etc.)
bDataValid = true;
return pForwarder.get();
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 6de682a5ce14..fcb986514ef8 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -199,7 +199,7 @@ ScUnoEditEngine::ScUnoEditEngine(ScEditEngineDefaulter* pSource)
, nFieldIndex(0)
{
std::unique_ptr<EditTextObject> pData = pSource->CreateTextObject();
- SetText( *pData );
+ SetTextCurrentDefaults( *pData );
}
OUString ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField,
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 914a398d82f2..61882737b8b6 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -223,7 +223,7 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
return pForwarder.get();
if (mpTextObj)
- pEditEngine->SetText(*mpTextObj);
+ pEditEngine->SetTextCurrentDefaults(*mpTextObj);
bDataValid = true;
return pForwarder.get();
@@ -342,7 +342,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString()
FillDummyFieldData( aData );
aEditEngine.SetData( aData );
- aEditEngine.SetText(*pData);
+ aEditEngine.SetTextCurrentDefaults(*pData);
aRet = ScEditUtil::GetSpaceDelimitedString( aEditEngine );
}
return aRet;
@@ -354,7 +354,7 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText )
// for pure text, no font info is needed in pool defaults
ScHeaderEditEngine aEditEngine(EditEngine::CreatePool());
- aEditEngine.SetText( aText );
+ aEditEngine.SetTextCurrentDefaults( aText );
aTextData.UpdateData(aEditEngine);
}
@@ -741,7 +741,7 @@ ScEditEngineTextObj::~ScEditEngineTextObj() throw()
void ScEditEngineTextObj::SetText( const EditTextObject& rTextObject )
{
- GetEditEngine()->SetText( rTextObject );
+ GetEditEngine()->SetTextCurrentDefaults( rTextObject );
ESelection aSel;
::GetSelection( aSel, GetEditSource()->GetTextForwarder() );
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
{