sd/source/ui/docshell/docshel4.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit 94ba923808ff8ed6fe893b0a85d27b41eccec3f8 Author: Michael Meeks <[email protected]> Date: Thu Mar 19 12:12:46 2015 +0000 compile fixes. Change-Id: I210c71c1a7236d286256a498f3f4f28f4185d052 diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 951b8d5..58c2bda 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -145,10 +145,8 @@ void DrawDocShell::SetPrinter(SfxPrinter *pNewPrinter) pView->SdrEndTextEdit(); } - if ( mpPrinter && mbOwnPrinter && (mpPrinter != pNewPrinter) ) - { + if ( mpPrinter && mbOwnPrinter && (mpPrinter.get() != pNewPrinter) ) mpPrinter.disposeAndClear(); - } mpPrinter = pNewPrinter; mbOwnPrinter = true; @@ -222,7 +220,7 @@ void DrawDocShell::UpdateRefDevice() // as a fall-back. DBG_ASSERT(false, "DrawDocShell::UpdateRefDevice(): Unexpected printer layout mode"); - pRefDevice = mpPrinter; + pRefDevice = mpPrinter.get(); break; } mpDoc->SetRefDevice( pRefDevice.get() ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
