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/pagedlg | |
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/pagedlg')
-rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 28 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 |
2 files changed, 15 insertions, 15 deletions
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 ) |