diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-09-05 00:46:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-09-05 01:15:19 +0300 |
| commit | bc10d6c9dbf2c682a2c40f61bcac4439b0f4bc7b (patch) | |
| tree | 4e19afd7784ccf4e7a01ce023ca165c22bc7ef02 /sc | |
| parent | bfb22c85602c8fbf78fe446de81eadb4eed4ea2d (diff) | |
Prefix one more member of ScDocument: pNoteEngine
Change-Id: I93b95b8aca22df81985e4479fa6a7126eab45f0f
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/document.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/documen2.cxx | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index ac5cd7618ade..498ea76b119f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -318,7 +318,7 @@ private: SfxUndoManager* mpUndoManager; ScFieldEditEngine* mpEditEngine; // uses pEditPool from xPoolHelper - ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper + ScNoteEditEngine* mpNoteEngine; // uses pEditPool from xPoolHelper SfxObjectShell* pShell; VclPtr<SfxPrinter> pPrinter; VclPtr<VirtualDevice> pVirtualDevice_100th_mm; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index e5242f012849..78cc2a103d05 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -137,7 +137,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : maCalcConfig( ScInterpreter::GetGlobalConfig()), mpUndoManager( nullptr ), mpEditEngine( nullptr ), - pNoteEngine( nullptr ), + mpNoteEngine( nullptr ), pShell( pDocShell ), pPrinter( nullptr ), pVirtualDevice_100th_mm( nullptr ), @@ -436,7 +436,7 @@ ScDocument::~ScDocument() delete pDetOpList; // also deletes entries delete pChangeTrack; delete mpEditEngine; - delete pNoteEngine; + delete mpNoteEngine; delete pChangeViewSettings; // and delete pVirtualDevice_100th_mm.disposeAndClear(); @@ -528,19 +528,19 @@ ScFieldEditEngine& ScDocument::GetEditEngine() ScNoteEditEngine& ScDocument::GetNoteEngine() { - if ( !pNoteEngine ) + if ( !mpNoteEngine ) { - pNoteEngine = new ScNoteEditEngine( GetEnginePool(), GetEditPool() ); - pNoteEngine->SetUpdateMode( false ); - pNoteEngine->EnableUndo( false ); - pNoteEngine->SetRefMapMode( MapUnit::Map100thMM ); - ApplyAsianEditSettings( *pNoteEngine ); + mpNoteEngine = new ScNoteEditEngine( GetEnginePool(), GetEditPool() ); + mpNoteEngine->SetUpdateMode( false ); + mpNoteEngine->EnableUndo( false ); + mpNoteEngine->SetRefMapMode( MapUnit::Map100thMM ); + ApplyAsianEditSettings( *mpNoteEngine ); const SfxItemSet& rItemSet = GetDefPattern()->GetItemSet(); - SfxItemSet* pEEItemSet = new SfxItemSet( pNoteEngine->GetEmptyItemSet() ); + SfxItemSet* pEEItemSet = new SfxItemSet( mpNoteEngine->GetEmptyItemSet() ); ScPatternAttr::FillToEditItemSet( *pEEItemSet, rItemSet ); - pNoteEngine->SetDefaults( pEEItemSet ); // edit engine takes ownership + mpNoteEngine->SetDefaults( pEEItemSet ); // edit engine takes ownership } - return *pNoteEngine; + return *mpNoteEngine; } void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ) |