diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-09-05 00:44:35 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-09-05 01:14:42 +0300 |
commit | bfb22c85602c8fbf78fe446de81eadb4eed4ea2d (patch) | |
tree | efd4e55091535cb84f812275456c075e2eed0aae /sc | |
parent | 564ec47db30e888faa88bd9bc5ef4c09a501944d (diff) |
Prefix one more member of ScDocument: pEditEngine
Change-Id: Ib46b9b2b2b797f1d2de294819bf641f199e55dfa
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/document.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/documen2.cxx | 18 | ||||
-rw-r--r-- | sc/source/core/data/documen8.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/documen9.cxx | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index b28361101dd2..ac5cd7618ade 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -317,7 +317,7 @@ private: ScCalcConfig maCalcConfig; SfxUndoManager* mpUndoManager; - ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper + ScFieldEditEngine* mpEditEngine; // uses pEditPool from xPoolHelper ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper SfxObjectShell* pShell; VclPtr<SfxPrinter> pPrinter; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 91245e509938..e5242f012849 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -136,7 +136,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : mpFormulaGroupCxt(nullptr), maCalcConfig( ScInterpreter::GetGlobalConfig()), mpUndoManager( nullptr ), - pEditEngine( nullptr ), + mpEditEngine( nullptr ), pNoteEngine( nullptr ), pShell( pDocShell ), pPrinter( nullptr ), @@ -435,7 +435,7 @@ ScDocument::~ScDocument() delete pClipData; delete pDetOpList; // also deletes entries delete pChangeTrack; - delete pEditEngine; + delete mpEditEngine; delete pNoteEngine; delete pChangeViewSettings; // and delete pVirtualDevice_100th_mm.disposeAndClear(); @@ -515,15 +515,15 @@ SfxItemPool* ScDocument::GetEnginePool() const ScFieldEditEngine& ScDocument::GetEditEngine() { - if ( !pEditEngine ) + if ( !mpEditEngine ) { - pEditEngine = new ScFieldEditEngine(this, GetEnginePool(), GetEditPool()); - pEditEngine->SetUpdateMode( false ); - pEditEngine->EnableUndo( false ); - pEditEngine->SetRefMapMode( MapUnit::Map100thMM ); - ApplyAsianEditSettings( *pEditEngine ); + mpEditEngine = new ScFieldEditEngine(this, GetEnginePool(), GetEditPool()); + mpEditEngine->SetUpdateMode( false ); + mpEditEngine->EnableUndo( false ); + mpEditEngine->SetRefMapMode( MapUnit::Map100thMM ); + ApplyAsianEditSettings( *mpEditEngine ); } - return *pEditEngine; + return *mpEditEngine; } ScNoteEditEngine& ScDocument::GetNoteEngine() diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 32680121a07d..8f1908d4383b 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1191,7 +1191,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, Transliteratio bool bConsiderLanguage = aTransliterationWrapper.needLanguageForTheMode(); LanguageType nLanguage = LANGUAGE_SYSTEM; - std::unique_ptr<ScEditEngineDefaulter> pEngine; // not using pEditEngine member because of defaults + std::unique_ptr<ScEditEngineDefaulter> pEngine; // not using mpEditEngine member because of defaults SCTAB nCount = GetTableCount(); ScMarkData::const_iterator itr = rMultiMark.begin(), itrEnd = rMultiMark.end(); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 7ba12255a32e..5610f967f73b 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -633,7 +633,7 @@ const std::shared_ptr<SvxForbiddenCharactersTable>& ScDocument::GetForbiddenChar void ScDocument::SetForbiddenCharacters(const std::shared_ptr<SvxForbiddenCharactersTable>& rNew) { xForbiddenCharacters = rNew; - if ( pEditEngine ) + if ( mpEditEngine ) EditEngine::SetForbiddenCharsTable( xForbiddenCharacters ); if ( pDrawLayer ) pDrawLayer->SetForbiddenCharsTable( xForbiddenCharacters ); @@ -655,8 +655,8 @@ CharCompressType ScDocument::GetAsianCompression() const void ScDocument::SetAsianCompression(CharCompressType nNew) { nAsianCompression = nNew; - if ( pEditEngine ) - pEditEngine->SetAsianCompressionMode( nAsianCompression ); + if ( mpEditEngine ) + mpEditEngine->SetAsianCompressionMode( nAsianCompression ); if ( pDrawLayer ) pDrawLayer->SetCharCompressType( nAsianCompression ); } @@ -677,8 +677,8 @@ bool ScDocument::GetAsianKerning() const void ScDocument::SetAsianKerning(bool bNew) { nAsianKerning = (sal_uInt8)bNew; - if ( pEditEngine ) - pEditEngine->SetKernAsianPunctuation( static_cast<bool>( nAsianKerning ) ); + if ( mpEditEngine ) + mpEditEngine->SetKernAsianPunctuation( static_cast<bool>( nAsianKerning ) ); if ( pDrawLayer ) pDrawLayer->SetKernAsianPunctuation( static_cast<bool>( nAsianKerning ) ); } |