summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj
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/unoobj
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/unoobj')
-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
3 files changed, 6 insertions, 6 deletions
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() );