Kaydet (Commit) 768b9769 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Prefix one more member of ScDocument: pVirtualDevice_100th_mm

Change-Id: Idf82b514eac385ff3e9f9dc373d0e7fd41d00819
üst efefb50e
......@@ -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
......
......@@ -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;
......
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment