diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-09-12 12:13:06 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-09-12 13:07:16 +0300 |
commit | 768b97691b0b2575af788ed86399f2a034c9eb1f (patch) | |
tree | ce405f704c4c91c968d0196843d103e40433fa55 /sc | |
parent | efefb50e7407b733b49dc1d05a89506a25198da3 (diff) |
Prefix one more member of ScDocument: pVirtualDevice_100th_mm
Change-Id: Idf82b514eac385ff3e9f9dc373d0e7fd41d00819
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/document.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/documen2.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/documen8.cxx | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 524e68aaccf2..c9a68c40a74e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -322,7 +322,7 @@ private: ScNoteEditEngine* mpNoteEngine; // uses pEditPool from xPoolHelper SfxObjectShell* mpShell; VclPtr<SfxPrinter> mpPrinter; - VclPtr<VirtualDevice> pVirtualDevice_100th_mm; + VclPtr<VirtualDevice> mpVirtualDevice_100th_mm; ScDrawLayer* pDrawLayer; // SdrModel rtl::Reference<XColorList> pColorList; ScValidationDataList* pValidationList; // validity diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 6650ab65ea15..8f2200d24df7 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -140,7 +140,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : mpNoteEngine( nullptr ), mpShell( pDocShell ), mpPrinter( nullptr ), - pVirtualDevice_100th_mm( nullptr ), + mpVirtualDevice_100th_mm( nullptr ), pDrawLayer( nullptr ), pValidationList( nullptr ), pFormatExchangeList( nullptr ), @@ -436,7 +436,7 @@ ScDocument::~ScDocument() delete mpEditEngine; delete mpNoteEngine; delete pChangeViewSettings; // and delete - pVirtualDevice_100th_mm.disposeAndClear(); + mpVirtualDevice_100th_mm.disposeAndClear(); delete pDPCollection; delete mpAnonymousDBData; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 3ce7e594a317..961f6456235d 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -187,19 +187,19 @@ void ScDocument::SetPrintOptions() VirtualDevice* ScDocument::GetVirtualDevice_100th_mm() { - if (!pVirtualDevice_100th_mm) + if (!mpVirtualDevice_100th_mm) { #ifdef IOS - pVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::GRAYSCALE); + mpVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::GRAYSCALE); #else - pVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::BITMASK); + mpVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::BITMASK); #endif - pVirtualDevice_100th_mm->SetReferenceDevice(VirtualDevice::RefDevMode::MSO1); - MapMode aMapMode( pVirtualDevice_100th_mm->GetMapMode() ); + mpVirtualDevice_100th_mm->SetReferenceDevice(VirtualDevice::RefDevMode::MSO1); + MapMode aMapMode( mpVirtualDevice_100th_mm->GetMapMode() ); aMapMode.SetMapUnit( MapUnit::Map100thMM ); - pVirtualDevice_100th_mm->SetMapMode( aMapMode ); + mpVirtualDevice_100th_mm->SetMapMode( aMapMode ); } - return pVirtualDevice_100th_mm; + return mpVirtualDevice_100th_mm; } OutputDevice* ScDocument::GetRefDevice() |