From 89d2733e16ae6233deea6bef3193bd45c89b854c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 21 Dec 2011 16:39:22 +0100 Subject: sw: fdo#39159 fdo#40482: temp selection print doc: Ensure that the printing temp selection document is not destroyed prematurely by SwXTextView::NotifySelChanged, called via ViewOptionAdjustStop, by retaining the temp doc object shell not at the View but in SwRenderData. Not restoring the view options for selections does not actually work, because having a selection surprisingly does not imply printing a temp document: the preview also uses a selection. (view option regression from cd690d2e72be410058376c416a40ff5d918fb0f7) --- sw/inc/unotxdoc.hxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sw/inc/unotxdoc.hxx') diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 5d61a9a60b5e..42d646f26b0a 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -589,10 +589,9 @@ class SwViewOptionAdjust_Impl { ViewShell & m_rShell; SwViewOption m_aOldViewOptions; - bool m_bIsTmpSelection; public: - SwViewOptionAdjust_Impl( ViewShell& rSh, const SwViewOption &rViewOptions, bool bIsTmpSelection ); + SwViewOptionAdjust_Impl( ViewShell& rSh, const SwViewOption &rViewOptions ); ~SwViewOptionAdjust_Impl(); void AdjustViewOptions( SwPrintData const* const pPrtOptions ); bool checkShell( const ViewShell& rCompare ) const -- cgit