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