[Libreoffice-commits] core.git: sc/inc sc/source
Stephan Bergmann
sbergman at redhat.com
Thu Dec 22 22:33:46 UTC 2016
sc/inc/document.hxx | 2 +-
sc/source/core/data/documen8.cxx | 2 +-
sc/source/ui/docshell/docsh3.cxx | 2 +-
sc/source/ui/inc/docsh.hxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 14aeace3a192219b2aba1586c09806a482d89ee0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 22 23:33:23 2016 +0100
Pass SfxPrinter by VclPtr
Change-Id: Id5a8949e6995be70f3d831e98449f5d10bcb040f
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3d5d8f7..25e3c4b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1901,7 +1901,7 @@ public:
SCTAB nTab );
SfxPrinter* GetPrinter( bool bCreateIfNotExist = true );
- void SetPrinter( SfxPrinter* pNewPrinter );
+ void SetPrinter( VclPtr<SfxPrinter> const & pNewPrinter );
VirtualDevice* GetVirtualDevice_100th_mm();
SC_DLLPUBLIC OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice...
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 55ca6a5..b5ce6d4 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -145,7 +145,7 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist)
return pPrinter;
}
-void ScDocument::SetPrinter( SfxPrinter* pNewPrinter )
+void ScDocument::SetPrinter( VclPtr<SfxPrinter> const & pNewPrinter )
{
if ( pNewPrinter == pPrinter.get() )
{
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index d8d208d..c50435b 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -466,7 +466,7 @@ OutputDevice* ScDocShell::GetRefDevice()
return aDocument.GetRefDevice();
}
-sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags )
+sal_uInt16 ScDocShell::SetPrinter( VclPtr<SfxPrinter> const & pNewPrinter, SfxPrinterChangeFlags nDiffFlags )
{
SfxPrinter *pOld = aDocument.GetPrinter( false );
if ( pOld && pOld->IsPrinting() )
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 0abc289..e2a75c3 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -229,7 +229,7 @@ public:
#endif
SfxPrinter* GetPrinter( bool bCreateIfNotExist = true );
- sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
+ sal_uInt16 SetPrinter( VclPtr<SfxPrinter> const & pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
void UpdateFontList();
More information about the Libreoffice-commits
mailing list