From ca16def26fa3352edbb642b918b59de1b2fa7fca Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 5 Dec 2019 11:32:16 +0000
Subject: rename ScEditEngineDefaulter::SetText
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sc/source/filter/excel/xehelper.cxx  | 2 +-
 sc/source/filter/excel/xicontent.cxx | 4 ++--
 sc/source/filter/excel/xihelper.cxx  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sc/source/filter/excel')

diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index e75958935d69..409893e7c68c 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -583,7 +583,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
     rEE.SetDefaults( std::move(pEEItemSet) );      // edit engine takes ownership
 
     // create the string
-    rEE.SetText(rEditText);
+    rEE.SetTextCurrentDefaults(rEditText);
     xString = lclCreateFormattedString( rRoot, rEE, &rLinkHelper, nFlags, nMaxLen );
     rEE.SetUpdateMode( bOldUpdateMode );
 
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 298f612f2b1c..2ab9dc703875 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -178,12 +178,12 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW
             if( aCell.meType == CELLTYPE_EDIT )
             {
                 const EditTextObject* pEditObj = aCell.mpEditText;
-                rEE.SetText( *pEditObj );
+                rEE.SetTextCurrentDefaults( *pEditObj );
                 rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), ESelection( 0, 0, EE_PARA_ALL, 0 ) );
             }
             else
             {
-                rEE.SetText( EMPTY_OUSTRING );
+                rEE.SetTextCurrentDefaults( EMPTY_OUSTRING );
                 rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), ESelection() );
                 if( const ScPatternAttr* pPattern = rDoc.getDoc().GetPattern( aScPos.Col(), aScPos.Row(), nScTab ) )
                 {
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index df62f997daa9..e2160048b597 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -153,7 +153,7 @@ std::unique_ptr<EditTextObject> lclCreateTextObject( const XclImpRoot& rRoot,
         const XclFormatRunVec& rFormats = rString.GetFormats();
 
         ScEditEngineDefaulter& rEE = rRoot.GetEditEngine();
-        rEE.SetText( rString.GetText() );
+        rEE.SetTextCurrentDefaults( rString.GetText() );
 
         SfxItemSet aItemSet( rEE.GetEmptyItemSet() );
         if( bFirstEscaped )
@@ -240,7 +240,7 @@ void XclImpStringHelper::SetToDocument(
         {
             // Multiline content.
             ScFieldEditEngine& rEngine = rDoc.getDoc().GetEditEngine();
-            rEngine.SetText(aStr);
+            rEngine.SetTextCurrentDefaults(aStr);
             rDoc.setEditCell(rPos, rEngine.CreateTextObject());
         }
         else
-- 
cgit