SwRenderData: more cleanup

sw/inc/printdata.hxx

@@ -245,9 +245,9 @@ class SwRenderData
     rtl::OUString               m_aPageRange;
 
     // the view options to be applied for printing
-    SwViewOptionAdjust_Impl *   m_pViewOptionAdjust;
+    ::boost::scoped_ptr<SwViewOptionAdjust_Impl> m_pViewOptionAdjust;
 
-    SwPrintData *               m_pPrtOptions;
+    ::boost::scoped_ptr<SwPrintData>    m_pPrtOptions;
 
 public:
 
@@ -273,11 +273,9 @@ public:
     void ViewOptionAdjustStop();
 
     bool HasSwPrtOptions() const    { return m_pPrtOptions != 0; }
-    void SetSwPrtOptions(SwPrintData *const pOpt)   { m_pPrtOptions = pOpt; }
-    SwPrintData const*  GetSwPrtOptions() const     { return m_pPrtOptions; }
-    SwPrintData &       GetSwPrtOptionsRef()        { return *m_pPrtOptions; }
-    void MakeSwPrtOptions( SwPrintData & rOptions, const SwDocShell *pDocShell,
-            const SwPrintUIOptions *pOpt, const SwRenderData *pData, bool bIsPDFExport );
+    SwPrintData const*  GetSwPrtOptions() const { return m_pPrtOptions.get(); }
+    void MakeSwPrtOptions( SwDocShell const*const pDocShell,
+            SwPrintUIOptions const*const pOpt, bool const bIsPDFExport );
 
 
     typedef std::vector< std::pair< sal_Int32, sal_Int32 > >    PagePairsVec_t;

sw/source/core/view/printdata.cxx

@@ -58,15 +58,11 @@ using ::rtl::OUString;
 
 SwRenderData::SwRenderData()
 {
-    m_pViewOptionAdjust = 0;
-    m_pPrtOptions       = 0;
 }
 
 
 SwRenderData::~SwRenderData()
 {
-    delete m_pViewOptionAdjust;     m_pViewOptionAdjust = 0;
-    delete m_pPrtOptions;           m_pPrtOptions = 0;
     OSL_ENSURE( !m_pPostItShell, "m_pPostItShell should already have been deleted" );
     OSL_ENSURE( !m_pPostItDoc, "m_pPostItDoc should already have been deleted" );
     OSL_ENSURE( !m_pPostItFields, " should already have been deleted" );
@@ -113,7 +109,8 @@ void SwRenderData::ViewOptionAdjustStart( ViewShell &rSh, const SwViewOption &rV
     {
         OSL_FAIL("error: there should be no ViewOptionAdjust active when calling this function" );
     }
-    m_pViewOptionAdjust = new SwViewOptionAdjust_Impl( rSh, rViewOptions, bIsTmpSelection );
+    m_pViewOptionAdjust.reset(
+            new SwViewOptionAdjust_Impl( rSh, rViewOptions, bIsTmpSelection ));
 }
 
 
@@ -125,24 +122,21 @@ void SwRenderData::ViewOptionAdjust(SwPrintData const*const pPrtOptions)
 
 void SwRenderData::ViewOptionAdjustStop()
 {
-    if (m_pViewOptionAdjust)
-    {
-        delete m_pViewOptionAdjust;
-        m_pViewOptionAdjust = 0;
-    }
+    m_pViewOptionAdjust.reset();
 }
 
 
 void SwRenderData::MakeSwPrtOptions(
-    SwPrintData & rOptions,
-    const SwDocShell *pDocShell,
-    const SwPrintUIOptions *pOpt,
-    const SwRenderData *pData,
-    bool bIsPDFExport )
+    SwDocShell const*const pDocShell,
+    SwPrintUIOptions const*const pOpt,
+    bool const bIsPDFExport)
 {
-    if (!pDocShell || !pOpt || !pData)
+    if (!pDocShell || !pOpt)
         return;
 
+    m_pPrtOptions.reset(new SwPrintData);
+    SwPrintData & rOptions(*m_pPrtOptions);
+
     // get default print options
     const TypeId aSwWebDocShellTypeId = TYPE(SwWebDocShell);
     sal_Bool bWeb = pDocShell->IsA( aSwWebDocShellTypeId );
@@ -172,7 +166,7 @@ void SwRenderData::MakeSwPrtOptions(
     //! needs to be set after MakeOptions since the assignment operation in that
     //! function will destroy the pointers
     rOptions.SetPrintUIOptions( pOpt );
-    rOptions.SetRenderData( pData );
+    rOptions.SetRenderData( this );
 }
 
 

sw/source/ui/uno/unotxdoc.cxx

@@ -2547,9 +2547,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
                     m_pRenderData->ViewOptionAdjustStart( *pViewShell, *pViewShell->GetViewOptions(), rSelection.hasValue() );
             }
 
-            m_pRenderData->SetSwPrtOptions( new SwPrintData );
-            m_pRenderData->MakeSwPrtOptions( m_pRenderData->GetSwPrtOptionsRef(), pRenderDocShell,
-                    m_pPrintUIOptions, m_pRenderData, bIsPDFExport );
+            m_pRenderData->MakeSwPrtOptions( pRenderDocShell,
+                    m_pPrintUIOptions, bIsPDFExport );
 
             if (pSwView)
             {