tdf#126673 Auto-fit column and auto-fit row don't work with line break
Revert "tdf#94677 Calc is slow opening large CSV, avoid reset SetUpdateMode"
This reverts commit c47d0174f2c6c3ebcb3b33276d0277e7aceac330.
Change-Id: I38e065d44dfb9d08498176b8231aff14ff51d91c
Reviewed-on: https://gerrit.libreoffice.org/77109
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f47177c..bebbd4f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -634,7 +634,7 @@ public:
void Clear( bool bFromDestructor = false );
std::unique_ptr<ScFieldEditEngine> CreateFieldEditEngine(bool bUpdateMode);
std::unique_ptr<ScFieldEditEngine> CreateFieldEditEngine();
void DisposeFieldEditEngine(std::unique_ptr<ScFieldEditEngine>& rpEditEngine);
/**
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 4bfacdde..151673e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -363,8 +363,9 @@ long ScColumn::GetNeededSize(
MapMode aHMMMode( MapUnit::Map100thMM, Point(), rZoomX, rZoomY );
// save in document ?
std::unique_ptr<ScFieldEditEngine> pEngine = pDocument->CreateFieldEditEngine(/*bUpdateMode*/false);
std::unique_ptr<ScFieldEditEngine> pEngine = pDocument->CreateFieldEditEngine();
pEngine->SetUpdateMode( false );
bool bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER );
EEControlBits nCtrl = pEngine->GetControlWord();
if ( bTextWysiwyg )
@@ -455,6 +456,7 @@ long ScColumn::GetNeededSize(
bool bEngineVertical = pEngine->IsVertical();
pEngine->SetVertical( bAsianVertical );
pEngine->SetUpdateMode( true );
bool bEdWidth = bWidth;
if ( eOrient != SvxCellOrientation::Standard && eOrient != SvxCellOrientation::Stacked )
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 15d95a9..b87d73a 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1091,7 +1091,7 @@ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew)
*pChangeViewSettings=rNew;
}
std::unique_ptr<ScFieldEditEngine> ScDocument::CreateFieldEditEngine(bool bUpdateMode)
std::unique_ptr<ScFieldEditEngine> ScDocument::CreateFieldEditEngine()
{
std::unique_ptr<ScFieldEditEngine> pNewEditEngine;
if (!pCacheFieldEditEngine)
@@ -1105,7 +1105,8 @@ std::unique_ptr<ScFieldEditEngine> ScDocument::CreateFieldEditEngine(bool bUpdat
{
// #i66209# previous use might not have restored update mode,
// ensure same state as for a new EditEngine (UpdateMode = true)
pCacheFieldEditEngine->SetUpdateMode(bUpdateMode);
if ( !pCacheFieldEditEngine->GetUpdateMode() )
pCacheFieldEditEngine->SetUpdateMode(true);
}
pNewEditEngine = std::move(pCacheFieldEditEngine);
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index c32edc0..acacc91 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1011,7 +1011,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
if ( pDocShell )
{
ScDocument& rDoc = pDocShell->GetDocument();
pEditEngine = rDoc.CreateFieldEditEngine(/*bUpdateMode*/true);
pEditEngine = rDoc.CreateFieldEditEngine();
}
else
{
@@ -1228,7 +1228,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
if ( mpDocSh )
{
ScDocument& rDoc = mpDocSh->GetDocument();
mpEditEngine = rDoc.CreateFieldEditEngine(/*bUpdateMode*/true);
mpEditEngine = rDoc.CreateFieldEditEngine();
}
else
{
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 3ef1645..c62d834 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -802,7 +802,7 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
if ( pDocShell )
{
ScDocument& rDoc = pDocShell->GetDocument();
pEditEngine = rDoc.CreateFieldEditEngine(/*bUpdateMode*/true);
pEditEngine = rDoc.CreateFieldEditEngine();
}
else
{
