sc/inc/document.hxx | 4 +--
sc/source/core/data/column2.cxx | 2 -
sc/source/core/data/column3.cxx | 4 +--
sc/source/core/data/documen2.cxx | 14 ++++++------
sc/source/core/data/documen8.cxx | 2 -
sc/source/core/data/poolhelp.cxx | 24 +++++++++++-----------
sc/source/core/data/table4.cxx | 4 +--
sc/source/core/inc/poolhelp.hxx | 8 +++----
sc/source/core/tool/editutil.cxx | 4 +--
sc/source/filter/excel/xlroot.cxx | 4 +--
sc/source/filter/oox/workbookhelper.cxx | 4 +--
sc/source/filter/rtf/eeimpars.cxx | 2 -
sc/source/filter/rtf/expbase.cxx | 2 -
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 2 -
sc/source/filter/xml/xmlexprt.cxx | 4 +--
sc/source/filter/xml/xmlfonte.cxx | 2 -
sc/source/filter/xml/xmlimprt.cxx | 4 +--
sc/source/ui/app/inputhdl.cxx | 2 -
sc/source/ui/app/inputwin.cxx | 4 +--
sc/source/ui/app/transobj.cxx | 2 -
sc/source/ui/docshell/docsh8.cxx | 2 -
sc/source/ui/unoobj/cellsuno.cxx | 4 +--
sc/source/ui/view/gridwin.cxx | 2 -
sc/source/ui/view/output2.cxx | 2 -
sc/source/ui/view/spelldialog.cxx | 2 -
sc/source/ui/view/viewfun2.cxx | 4 +--
sc/source/ui/view/viewfun4.cxx | 12 +++++------
sc/source/ui/view/viewfunc.cxx | 4 +--
28 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit a4b30d0780442dbfacde54ed28e3a92a32a3126e
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jul 15 20:42:06 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Wed Jul 16 17:54:13 2025 +0200
rename a couple of ScPoolHelper methods
to make it a little more obvious what these otherwise very
similar SfxItemPools are destined for
Change-Id: Iea0527b2b3f58edbccdee6387232c6b7501d1f0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187935
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e327dc4efd4f..6c25687ef774 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2594,8 +2594,8 @@ public:
void SetInLinkUpdate(bool bSet); //
TableLink or AreaLink
bool IsInLinkUpdate() const; //
including DdeLink
- SC_DLLPUBLIC SfxItemPool* GetEditPool() const;
- SC_DLLPUBLIC SfxItemPool* GetEnginePool() const;
+ SC_DLLPUBLIC SfxItemPool* GetEditTextObjectPool() const;
+ SC_DLLPUBLIC SfxItemPool* GetEditEnginePool() const;
SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine();
SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine();
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index b2aa37dd78e5..c3bf713ad2f4 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1210,7 +1210,7 @@ public:
// test for attributes
if (!mpEngine)
{
- mpEngine.reset(new ScFieldEditEngine(&mrDoc, mrDoc.GetEditPool()));
+ mpEngine.reset(new ScFieldEditEngine(&mrDoc,
mrDoc.GetEditTextObjectPool()));
// EEControlBits::ONLINESPELLING if there are errors already
mpEngine->SetControlWord(mpEngine->GetControlWord() |
EEControlBits::ONLINESPELLING);
mrDoc.ApplyAsianEditSettings(*mpEngine);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index b97f877f0abb..6c685d2061bb 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2394,7 +2394,7 @@ void ScColumn::SetEditText( sc::ColumnBlockPosition&
rBlockPos, SCROW nRow, std:
void ScColumn::SetEditText( sc::ColumnBlockPosition& rBlockPos, SCROW nRow,
const EditTextObject& rEditText )
{
- if (GetDoc().GetEditPool() == rEditText.GetPool())
+ if (GetDoc().GetEditTextObjectPool() == rEditText.GetPool())
{
SetEditText(rBlockPos, nRow, rEditText.Clone());
return;
@@ -2410,7 +2410,7 @@ void ScColumn::SetEditText( sc::ColumnBlockPosition&
rBlockPos, SCROW nRow, cons
void ScColumn::SetEditText( SCROW nRow, const EditTextObject& rEditText, const
SfxItemPool* pEditPool )
{
- if (pEditPool && GetDoc().GetEditPool() == pEditPool)
+ if (pEditPool && GetDoc().GetEditTextObjectPool() == pEditPool)
{
SetEditText(nRow, rEditText.Clone());
return;
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f513239ffe83..87a236dff2a6 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -486,21 +486,21 @@ SvNumberFormatter* ScDocument::GetFormatTable() const
return mxPoolHelper->GetFormTable();
}
-SfxItemPool* ScDocument::GetEditPool() const
+SfxItemPool* ScDocument::GetEditTextObjectPool() const
{
- return mxPoolHelper->GetEditPool();
+ return mxPoolHelper->GetEditTextObjectPool();
}
-SfxItemPool* ScDocument::GetEnginePool() const
+SfxItemPool* ScDocument::GetEditEnginePool() const
{
- return mxPoolHelper->GetEnginePool();
+ return mxPoolHelper->GetEditEnginePool();
}
ScFieldEditEngine& ScDocument::GetEditEngine()
{
if ( !mpEditEngine )
{
- mpEditEngine.reset( new ScFieldEditEngine(this, GetEnginePool(),
GetEditPool()) );
+ mpEditEngine.reset( new ScFieldEditEngine(this, GetEditEnginePool(),
GetEditTextObjectPool()) );
mpEditEngine->SetUpdateLayout( false );
mpEditEngine->EnableUndo( false );
mpEditEngine->SetRefMapMode(MapMode(MapUnit::Map100thMM));
@@ -514,7 +514,7 @@ ScNoteEditEngine& ScDocument::GetNoteEngine()
if ( !mpNoteEngine )
{
ScMutationGuard aGuard(*this, ScMutationGuardFlags::CORE);
- mpNoteEngine.reset( new ScNoteEditEngine( GetEnginePool(),
GetEditPool() ) );
+ mpNoteEngine.reset( new ScNoteEditEngine( GetEditEnginePool(),
GetEditTextObjectPool() ) );
mpNoteEngine->SetUpdateLayout( false );
mpNoteEngine->EnableUndo( false );
mpNoteEngine->SetRefMapMode(MapMode(MapUnit::Map100thMM));
@@ -1211,7 +1211,7 @@ std::unique_ptr<ScFieldEditEngine>
ScDocument::CreateFieldEditEngine()
if (!pCacheFieldEditEngine)
{
pNewEditEngine.reset( new ScFieldEditEngine(
- this, GetEnginePool(), GetEditPool(), false) );
+ this, GetEditEnginePool(), GetEditTextObjectPool(), false) );
}
else
{
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 16443d1b84fe..1208ed0f3cd3 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1241,7 +1241,7 @@ void ScDocument::TransliterateText( const ScMarkData&
rMultiMark, Transliteratio
( nType == TransliterationFlags::SENTENCE_CASE || nType
== TransliterationFlags::TITLE_CASE)))
{
if (!pEngine)
- pEngine.reset(new ScFieldEditEngine(this,
GetEnginePool(), GetEditPool()));
+ pEngine.reset(new ScFieldEditEngine(this,
GetEditEnginePool(), GetEditTextObjectPool()));
// defaults from cell attributes must be set so right
language is used
const ScPatternAttr* pPattern = GetPattern( nCol, nRow,
nTab );
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index f66cd4b0212c..829c3f69e27d 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -35,31 +35,31 @@ ScPoolHelper::ScPoolHelper( ScDocument& rSourceDoc )
ScPoolHelper::~ScPoolHelper()
{
- pEnginePool.clear();
- pEditPool.clear();
+ mpEditTextObjectPool.clear();
+ mpEditEnginePool.clear();
pFormTable.reset();
mxStylePool.clear();
pDocPool.clear();
}
-SfxItemPool* ScPoolHelper::GetEditPool() const
+SfxItemPool* ScPoolHelper::GetEditTextObjectPool() const
{
- if ( !pEditPool )
+ if ( !mpEditTextObjectPool )
{
- pEditPool = EditEngine::CreatePool();
- pEditPool->SetDefaultMetric( MapUnit::Map100thMM );
+ mpEditTextObjectPool = EditEngine::CreatePool();
+ mpEditTextObjectPool->SetDefaultMetric( MapUnit::Map100thMM );
}
- return pEditPool.get();
+ return mpEditTextObjectPool.get();
}
-SfxItemPool* ScPoolHelper::GetEnginePool() const
+SfxItemPool* ScPoolHelper::GetEditEnginePool() const
{
- if ( !pEnginePool )
+ if ( !mpEditEnginePool )
{
- pEnginePool = EditEngine::CreatePool();
- pEnginePool->SetDefaultMetric( MapUnit::Map100thMM );
+ mpEditEnginePool = EditEngine::CreatePool();
+ mpEditEnginePool->SetDefaultMetric( MapUnit::Map100thMM );
} // ifg ( pEnginePool )
- return pEnginePool.get();
+ return mpEditEnginePool.get();
}
SvNumberFormatter* ScPoolHelper::GetFormTable() const
{
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index edbcbe5e2543..d667824394e8 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -160,8 +160,8 @@ void setSuffixCell(
return;
}
- EditEngine aEngine(rDoc.GetEnginePool());
- aEngine.SetEditTextObjectPool(rDoc.GetEditPool());
+ EditEngine aEngine(rDoc.GetEditEnginePool());
+ aEngine.SetEditTextObjectPool(rDoc.GetEditTextObjectPool());
SfxItemSet aAttr = aEngine.GetEmptyItemSet();
aAttr.Put( SvxEscapementItem( SvxEscapement::Superscript,
EE_CHAR_ESCAPEMENT));
diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index 860e1b3a8b2f..f8f3777a8bd2 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -39,8 +39,8 @@ private:
rtl::Reference<ScDocumentPool> pDocPool;
rtl::Reference< ScStyleSheetPool > mxStylePool;
mutable std::unique_ptr<SvNumberFormatter> pFormTable;
- mutable rtl::Reference<SfxItemPool> pEditPool; // EditTextObjectPool
- mutable rtl::Reference<SfxItemPool> pEnginePool; // EditEnginePool
+ mutable rtl::Reference<SfxItemPool> mpEditTextObjectPool; //
EditTextObjectPool
+ mutable rtl::Reference<SfxItemPool> mpEditEnginePool; // EditEnginePool
public:
ScPoolHelper( ScDocument& rSourceDoc );
@@ -53,8 +53,8 @@ public:
ScDocumentPool* GetDocPool() const { return pDocPool.get(); }
ScStyleSheetPool* GetStylePool() const { return mxStylePool.get(); }
SvNumberFormatter* GetFormTable() const;
- SfxItemPool* GetEditPool() const;
- SfxItemPool* GetEnginePool() const;
+ SfxItemPool* GetEditTextObjectPool() const;
+ SfxItemPool* GetEditEnginePool() const;
void SetFormTableOpt(const ScDocOptions& rOpt);
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 97b9048413cd..7dbbea06cb6e 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -730,9 +730,9 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
}
ScTabEditEngine::ScTabEditEngine( ScDocument& rDoc )
- : ScFieldEditEngine( &rDoc, rDoc.GetEnginePool() )
+ : ScFieldEditEngine( &rDoc, rDoc.GetEditEnginePool() )
{
- SetEditTextObjectPool( rDoc.GetEditPool() );
+ SetEditTextObjectPool( rDoc.GetEditTextObjectPool() );
const ScPatternAttr&
rScPatternAttr(rDoc.getCellAttributeHelper().getDefaultCellAttribute());
Init(rScPatternAttr);
}
diff --git a/sc/source/filter/excel/xlroot.cxx
b/sc/source/filter/excel/xlroot.cxx
index 783d9c98e532..71089d10ec8f 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -365,10 +365,10 @@ ScEditEngineDefaulter& XclRoot::GetEditEngine() const
{
if( !mrData.mxEditEngine )
{
- mrData.mxEditEngine = std::make_shared<ScEditEngineDefaulter>(
GetDoc().GetEnginePool() );
+ mrData.mxEditEngine = std::make_shared<ScEditEngineDefaulter>(
GetDoc().GetEditEnginePool() );
ScEditEngineDefaulter& rEE = *mrData.mxEditEngine;
rEE.SetRefMapMode(MapMode(MapUnit::Map100thMM));
- rEE.SetEditTextObjectPool( GetDoc().GetEditPool() );
+ rEE.SetEditTextObjectPool( GetDoc().GetEditTextObjectPool() );
rEE.SetUpdateLayout( false );
rEE.EnableUndo( false );
rEE.SetControlWord( rEE.GetControlWord() &
~EEControlBits::ALLOWBIGOBJS );
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 5f7210c86a68..b99fa5f4b089 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -604,9 +604,9 @@ void WorkbookGlobals::initialize()
// initialise edit engine
ScDocument& rDoc = getScDocument();
- mxEditEngine.reset( new ScEditEngineDefaulter( rDoc.GetEnginePool() ) );
+ mxEditEngine.reset( new ScEditEngineDefaulter( rDoc.GetEditEnginePool() )
);
mxEditEngine->SetRefMapMode(MapMode(MapUnit::Map100thMM));
- mxEditEngine->SetEditTextObjectPool( rDoc.GetEditPool() );
+ mxEditEngine->SetEditTextObjectPool( rDoc.GetEditTextObjectPool() );
mxEditEngine->SetUpdateLayout( false );
mxEditEngine->EnableUndo( false );
mxEditEngine->SetControlWord( mxEditEngine->GetControlWord() &
~EEControlBits::ALLOWBIGOBJS );
diff --git a/sc/source/filter/rtf/eeimpars.cxx
b/sc/source/filter/rtf/eeimpars.cxx
index 1e75f6ec5ddf..eb58054289f4 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -65,7 +65,7 @@ ScEEImport::ScEEImport( ScDocument& rDoc, const ScRange&
rRange ) :
{
const ScPatternAttr* pPattern = mrDoc.GetPattern(
maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
- mpEngine.reset( new ScTabEditEngine(*pPattern, mrDoc.GetEditPool(), mrDoc,
mrDoc.GetEditPool()) );
+ mpEngine.reset( new ScTabEditEngine(*pPattern,
mrDoc.GetEditTextObjectPool(), mrDoc, mrDoc.GetEditTextObjectPool()) );
mpEngine->SetUpdateLayout( false );
mpEngine->EnableUndo( false );
}
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index d5461f1d6909..e33d547cf448 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -68,7 +68,7 @@ bool ScExportBase::IsEmptyTable( SCTAB nTab ) const
ScFieldEditEngine& ScExportBase::GetEditEngine() const
{
if ( !pEditEngine )
- const_cast<ScExportBase*>(this)->pEditEngine.reset( new
ScFieldEditEngine(pDoc, pDoc->GetEditPool()) );
+ const_cast<ScExportBase*>(this)->pEditEngine.reset( new
ScFieldEditEngine(pDoc, pDoc->GetEditTextObjectPool()) );
return *pEditEngine;
}
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index ee30c04ca084..2cbc2a499807 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -829,7 +829,7 @@ void ScXMLChangeCellContext::CreateTextPContext(bool
bIsNewParagraph)
return;
mpEditTextObj = new ScEditEngineTextObj();
- mpEditTextObj->GetEditEngine()->SetEditTextObjectPool(pDoc->GetEditPool());
+
mpEditTextObj->GetEditEngine()->SetEditTextObjectPool(pDoc->GetEditTextObjectPool());
uno::Reference<text::XTextCursor>
xTextCursor(mpEditTextObj->createTextCursor());
if (bIsNewParagraph)
{
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 5d8b0236bb34..0bf76547bead 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -5421,8 +5421,8 @@ ErrCode ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
}
CollectUserDefinedNamespaces(pDoc->GetPool(), ATTR_USERDEF);
- CollectUserDefinedNamespaces(pDoc->GetEditPool(),
EE_PARA_XMLATTRIBS);
- CollectUserDefinedNamespaces(pDoc->GetEditPool(),
EE_CHAR_XMLATTRIBS);
+ CollectUserDefinedNamespaces(pDoc->GetEditTextObjectPool(),
EE_PARA_XMLATTRIBS);
+ CollectUserDefinedNamespaces(pDoc->GetEditTextObjectPool(),
EE_CHAR_XMLATTRIBS);
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
if (pDrawLayer)
{
diff --git a/sc/source/filter/xml/xmlfonte.cxx
b/sc/source/filter/xml/xmlfonte.cxx
index 4575fc8abd46..69120ed68e12 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -85,7 +85,7 @@
ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScDocument* pDoc, ScXML
const SfxItemPool* pItemPool(pDoc->GetPool());
AddFontItems(aWhichIds, 3, pItemPool, true);
- const SfxItemPool* pEditPool(pDoc->GetEditPool());
+ const SfxItemPool* pEditPool(pDoc->GetEditTextObjectPool());
AddFontItems(aEditWhichIds, 3, pEditPool, false);
std::unique_ptr<SfxStyleSheetIterator> pItr =
pDoc->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page);
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 01ff78ec667f..2cc965549aaf 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1640,9 +1640,9 @@ ScEditEngineDefaulter* ScXMLImport::GetEditEngine()
{
if (!mpEditEngine && mpDoc)
{
- mpEditEngine.reset(new ScEditEngineDefaulter(mpDoc->GetEnginePool()));
+ mpEditEngine.reset(new
ScEditEngineDefaulter(mpDoc->GetEditEnginePool()));
mpEditEngine->SetRefMapMode(MapMode(MapUnit::Map100thMM));
- mpEditEngine->SetEditTextObjectPool(mpDoc->GetEditPool());
+ mpEditEngine->SetEditTextObjectPool(mpDoc->GetEditTextObjectPool());
mpEditEngine->SetUpdateLayout(false);
mpEditEngine->EnableUndo(false);
mpEditEngine->SetControlWord(mpEditEngine->GetControlWord() &
~EEControlBits::ALLOWBIGOBJS);
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 5c0a718a5ba6..af3de62fbaaf 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -926,7 +926,7 @@ void ScInputHandler::ImplCreateEditEngine()
// we cannot create a properly initialised EditEngine until we have a
document
assert( pActiveViewSh );
ScDocument& rDoc =
pActiveViewSh->GetViewData().GetDocShell().GetDocument();
- mpEditEngine = std::make_unique<ScFieldEditEngine>(&rDoc,
rDoc.GetEnginePool(), rDoc.GetEditPool());
+ mpEditEngine = std::make_unique<ScFieldEditEngine>(&rDoc,
rDoc.GetEditEnginePool(), rDoc.GetEditTextObjectPool());
mpEditEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters(
mpEditEngine->GetWordDelimiters() ) );
UpdateRefDevice(); // also sets MapMode
mpEditEngine->SetPaperSize( Size( 1000000, 1000000 ) );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 4ae5205ae4ae..18b18836c746 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1536,7 +1536,7 @@ void ScTextWnd::InitEditEngine()
{
pDocSh = &mpViewShell->GetViewData().GetDocShell();
ScDocument& rDoc = mpViewShell->GetViewData().GetDocument();
- pNew = std::make_unique<ScFieldEditEngine>(&rDoc,
rDoc.GetEnginePool(), rDoc.GetEditPool());
+ pNew = std::make_unique<ScFieldEditEngine>(&rDoc,
rDoc.GetEditEnginePool(), rDoc.GetEditTextObjectPool());
}
else
pNew = std::make_unique<ScFieldEditEngine>(nullptr,
EditEngine::CreatePool().get(), nullptr, true);
@@ -2106,7 +2106,7 @@ void ScTextWnd::MakeDialogEditView()
if ( pViewSh )
{
ScDocument& rDoc = pViewSh->GetViewData().GetDocument();
- pNew = std::make_unique<ScFieldEditEngine>(&rDoc,
rDoc.GetEnginePool(), rDoc.GetEditPool());
+ pNew = std::make_unique<ScFieldEditEngine>(&rDoc,
rDoc.GetEditEnginePool(), rDoc.GetEditTextObjectPool());
}
else
pNew = std::make_unique<ScFieldEditEngine>(nullptr,
EditEngine::CreatePool().get(), nullptr, true);
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index d1de5fcc5e8c..053ecc02c93d 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -317,7 +317,7 @@ bool ScTransferObj::GetData( const
datatransfer::DataFlavor& rFlavor, const OUSt
const ScPatternAttr* pPattern = m_pDoc->GetPattern( nCol, nRow,
nTab );
if (pPattern)
{
- ScTabEditEngine aEngine(*pPattern, m_pDoc->GetEditPool(),
*m_pDoc);
+ ScTabEditEngine aEngine(*pPattern,
m_pDoc->GetEditTextObjectPool(), *m_pDoc);
ScRefCellValue aCell(*m_pDoc, aPos);
if (aCell.getType() == CELLTYPE_EDIT)
{
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index d2f99c89442e..babab2abb4a6 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -785,7 +785,7 @@ ErrCodeMsg ScDocShell::DBaseExport( const OUString&
rFullFileName, rtl_TextEncod
bHasMemo, eCharSet );
// also needed for exception catch
SCROW nDocRow = 0;
- ScFieldEditEngine aEditEngine(m_pDocument.get(),
m_pDocument->GetEditPool());
+ ScFieldEditEngine aEditEngine(m_pDocument.get(),
m_pDocument->GetEditTextObjectPool());
OUString aString;
try
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index d5a92d43dc5a..60d2bbc51bbc 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2144,8 +2144,8 @@ void ScCellRangesBase::SetOnePropertyValue( const
SfxItemPropertyMapEntry* pEntr
ScRefCellValue aCell(rDoc, aAddr);
OUString aStr = aCell.getString(rDoc);
- EditEngine aEngine( rDoc.GetEnginePool() );
- aEngine.SetEditTextObjectPool(rDoc.GetEditPool());
+ EditEngine aEngine( rDoc.GetEditEnginePool() );
+
aEngine.SetEditTextObjectPool(rDoc.GetEditTextObjectPool());
/* EE_CHAR_ESCAPEMENT seems to be set on the cell
_only_ when
* there are no other attribs for the cell.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 581a7104d3a6..2c1ab215aa2c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5789,7 +5789,7 @@ std::shared_ptr<ScFieldEditEngine> createEditEngine(
ScDocShell& rDocSh, const S
{
ScDocument& rDoc = rDocSh.GetDocument();
- auto pEngine = std::make_shared<ScFieldEditEngine>(&rDoc,
rDoc.GetEditPool());
+ auto pEngine = std::make_shared<ScFieldEditEngine>(&rDoc,
rDoc.GetEditTextObjectPool());
ScSizeDeviceProvider aProv(rDocSh);
pEngine->SetRefDevice(aProv.GetDevice());
pEngine->SetRefMapMode(MapMode(MapUnit::Map100thMM));
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 17a9cbecd2db..3427fc2296c4 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2280,7 +2280,7 @@ void ScOutputData::InitOutputEditEngine()
{
if (!mxOutputEditEngine)
{
- mxOutputEditEngine = std::make_unique<ScFieldEditEngine>(mpDoc,
mpDoc->GetEnginePool());
+ mxOutputEditEngine = std::make_unique<ScFieldEditEngine>(mpDoc,
mpDoc->GetEditEnginePool());
mxOutputEditEngine->SetUpdateLayout( false );
mxOutputEditEngine->EnableUndo( false ); // don't need undo for
painting purposes
// a RefDevice always has to be set, otherwise EditEngine would create
a VirtualDevice
diff --git a/sc/source/ui/view/spelldialog.cxx
b/sc/source/ui/view/spelldialog.cxx
index e1c1cf6fd3fd..15c106893992 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -245,7 +245,7 @@ void ScSpellDialogChildWindow::Init()
// *** create and init the edit engine *** --------------------------------
mxEngine.reset( new ScSpellingEngine(
- mpDoc->GetEnginePool(), *mpViewData, mxUndoDoc.get(), mxRedoDoc.get(),
LinguMgr::GetSpellChecker() ) );
+ mpDoc->GetEditEnginePool(), *mpViewData, mxUndoDoc.get(),
mxRedoDoc.get(), LinguMgr::GetSpellChecker() ) );
mxEngine->SetRefDevice( mpViewData->GetActiveWin()->GetOutDev() );
mpViewShell->MakeEditView(*mxEngine, nCol, nRow);
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 85482f5d0f09..36b62e31d599 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -913,7 +913,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const
EditTextObject* pDat
if ( pData )
{
const ScPatternAttr* pOldPattern = rDoc.GetPattern( nCol, nRow, nTab );
- ScTabEditEngine aEngine( *pOldPattern, rDoc.GetEnginePool(), rDoc );
+ ScTabEditEngine aEngine( *pOldPattern, rDoc.GetEditEnginePool(), rDoc
);
aEngine.SetTextCurrentDefaults(*pData);
ScEditAttrTester aTester( &aEngine );
@@ -940,7 +940,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const
EditTextObject* pDat
else if ( pData )
{
// A copy of pData will be stored.
- pInsDoc->SetEditText(aPos, *pData, rDoc.GetEditPool());
+ pInsDoc->SetEditText(aPos, *pData, rDoc.GetEditTextObjectPool());
}
else
pInsDoc->SetString( nCol, nRow, nTab, aNewStr );
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 68b4ff090d5a..a917f534dfd2 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -89,7 +89,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
const bool bRecord (rDoc.IsUndoEnabled());
const ScPatternAttr* pPattern = rDoc.GetPattern( nStartCol, nStartRow,
nTab );
- std::optional<ScTabEditEngine> pEngine(std::in_place, *pPattern,
rDoc.GetEnginePool(), rDoc );
+ std::optional<ScTabEditEngine> pEngine(std::in_place, *pPattern,
rDoc.GetEditEnginePool(), rDoc );
pEngine->EnableUndo( false );
vcl::Window* pActWin = GetActiveWin();
@@ -357,8 +357,8 @@ void ScViewFunc::DoThesaurus()
uno::Reference<linguistic2::XSpellChecker1> xSpeller =
LinguMgr::GetSpellChecker();
- pThesaurusEngine.reset(new ScEditEngineDefaulter(rDoc.GetEnginePool()));
- pThesaurusEngine->SetEditTextObjectPool( rDoc.GetEditPool() );
+ pThesaurusEngine.reset(new
ScEditEngineDefaulter(rDoc.GetEditEnginePool()));
+ pThesaurusEngine->SetEditTextObjectPool( rDoc.GetEditTextObjectPool() );
pThesaurusEngine->SetRefDevice(GetViewData().GetActiveWin()->GetOutDev());
pThesaurusEngine->SetSpeller(xSpeller);
MakeEditView(*pThesaurusEngine, nCol, nRow);
@@ -509,12 +509,12 @@ void ScViewFunc::DoSheetConversion( const
ScConversionParam& rConvParam )
{
case SC_CONVERSION_SPELLCHECK:
pEngine.reset(new ScSpellingEngine(
- rDoc.GetEnginePool(), rViewData, pUndoDoc.get(),
pRedoDoc.get(), LinguMgr::GetSpellChecker() ));
+ rDoc.GetEditEnginePool(), rViewData, pUndoDoc.get(),
pRedoDoc.get(), LinguMgr::GetSpellChecker() ));
break;
case SC_CONVERSION_HANGULHANJA:
case SC_CONVERSION_CHINESE_TRANSL:
pEngine.reset(new ScTextConversionEngine(
- rDoc.GetEnginePool(), rViewData, rConvParam, pUndoDoc.get(),
pRedoDoc.get() ));
+ rDoc.GetEditEnginePool(), rViewData, rConvParam,
pUndoDoc.get(), pRedoDoc.get() ));
break;
}
@@ -716,7 +716,7 @@ void ScViewFunc::InsertBookmark( const OUString&
rDescription, const OUString& r
ScDocument& rDoc = GetViewData().GetDocument();
SCTAB nTab = GetViewData().GetTabNo();
ScAddress aCellPos( nPosX, nPosY, nTab );
- EditEngine aEngine( rDoc.GetEnginePool() );
+ EditEngine aEngine( rDoc.GetEditEnginePool() );
const EditTextObject* pOld = rDoc.GetEditText(aCellPos);
if (pOld)
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 2452d3d507f5..8c0b2c58e188 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -834,7 +834,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
OUString aString;
const ScPatternAttr* pOldPattern = rDoc.GetPattern( nCol, nRow, nTab );
- ScTabEditEngine aEngine( *pOldPattern, rDoc.GetEnginePool(), rDoc );
+ ScTabEditEngine aEngine( *pOldPattern, rDoc.GetEditEnginePool(), rDoc
);
aEngine.SetTextCurrentDefaults(rData);
if (bTestSimple) // test, if simple string without
attribute
@@ -899,7 +899,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
for (const auto& rTab : rMark)
{
ScAddress aPos(nCol, nRow, rTab);
- rDoc.SetEditText(aPos, rData, rDoc.GetEditPool());
+ rDoc.SetEditText(aPos, rData, rDoc.GetEditTextObjectPool());
}
if ( bRecord )
