[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-4' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/pagedlg/tphfedit.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54858bbc2ccd93a256d10ad155638da92e4126fd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 5 10:19:19 2019 +0000
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Dec 5 20:38:24 2019 +0100

    Resolves: tdf#129191 text properties in header/footer not set
    
    EditEngine has a non-virtual void SetText( const EditTextObject& rTextObject );
    ScEditEngineDefaulter inherits from EditEngine but does
    
    using EditEngine::SetText
    void            SetText( const EditTextObject& rTextObject );
    
    so has another SetText with the same signature that does something different,
    so calling via an EditEngine pointer gets the unwanted base version
    
    Change-Id: I72e368e6698d5b9a205180cfd2c4f800be7846f8
    Reviewed-on: https://gerrit.libreoffice.org/84546
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 9a41ffdd5476..01c10d080080 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -161,7 +161,7 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern )
 
 void ScEditWindow::SetText( const EditTextObject& rTextObject )
 {
-    m_xEditEngine->SetText( rTextObject );
+    GetEditEngine()->SetText( rTextObject );
 }
 
 void ScEditWindow::InsertField( const SvxFieldItem& rFld )