#i101242# new print UI

5 files changed, 72 insertions, 61 deletions

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 7292ce74fcff..216516d0d879 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -221,7 +221,7 @@ class SwXTextDocument : public SwXTextDocumentBaseClass,
     css::uno::Reference< css::uno::XInterface>      xPropertyHelper;
     SwXDocumentPropertyHelper*                      pPropertyHelper;
 
-    SwPrintUIOptions*                               m_pPrintUIOprions;
+    SwPrintUIOptions*                               m_pPrintUIOptions;
 
     void                    GetBodyText();
     void                    GetNumberFormatter();
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 31074dc1ac2c..351f1126103c 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -979,7 +979,11 @@ void lcl_SetState( SfxProgress& rProgress, ULONG nPage, ULONG nMax,
 
 
 void ViewShell::CalcPagesForPrint( USHORT nMax, SfxProgress* pProgress,
+<<<<<<< .mine
+    const XubString* /*TLPDF pStr*/, ULONG /*TLPDF nMergeAct*/, ULONG /*TLPDF nMergeCnt*/ )
+=======
     const XubString* /*pStr*/, ULONG /*nMergeAct*/, ULONG /*nMergeCnt*/ )
+>>>>>>> .r275036
 {
     SET_CURR_SHELL( this );
 
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index e53f5d766427..62fe78702d1f 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -908,6 +908,7 @@ BOOL SwNewDBMgr::MergePrint( SwView& /*rView*/,
 //TLPDF    SfxPrinter *pPrt = pSh->getIDocumentDeviceAccess()->getPrinter( false );
     const boost::shared_ptr< Printer > pPrt( new Printer /* Printer( const JobSetup& rJobSetup ) */ );     // TLPDF
     vcl::OldStylePrintAdaptor aPrtAdaptor( pPrt );                    // TLPDF
+    const boost::shared_ptr< vcl::PrinterController > pPrtController( &aPrtAdaptor );
 //TLPDF   Link aSfxSaveLnk = pPrt->GetEndPrintHdl();
 //TLPDF    if( rOpt.IsPrintSingleJobs()  )
 //TLPDF     pPrt->SetEndPrintHdl( Link() );
@@ -993,10 +994,10 @@ BOOL SwNewDBMgr::MergePrint( SwView& /*rView*/,
                     bRet = TRUE;
                 }
 #endif  // TL_NOT_NOW /*TLPDF*/
-                pSh->PrintProspectMM( aPrtAdaptor, rOpt, rOpt.IsPrintProspect_RTL() );  // TLPDF
+                pSh->PrintProspectMM( pPrtController, rOpt, rOpt.IsPrintProspect_RTL() );  // TLPDF
                 bRet = TRUE;                                                        // TLPDF
             }
-            else if( pSh->PrintOrPDFExportMM( aPrtAdaptor, rOpt ) /* TLPDF */ )
+            else if( pSh->PrintOrPDFExportMM( pPrtController, rOpt ) /* TLPDF */ )
                 bRet = TRUE;
             bMergeLock = FALSE;
 
@@ -1064,6 +1065,7 @@ BOOL SwNewDBMgr::MergePrintDocuments( SwView& /*rView*/,
 //TLPDF    SfxPrinter *pPrt = pSh->getIDocumentDeviceAccess()->getPrinter( false );
     const boost::shared_ptr< Printer > pPrt( new Printer /* Printer( const JobSetup& rJobSetup ) */ );     // TLPDF
     vcl::OldStylePrintAdaptor aPrtAdaptor( pPrt );                    // TLPDF
+    const boost::shared_ptr< vcl::PrinterController > pPrtController( &aPrtAdaptor );
 //TLPDF    Link aSfxSaveLnk = pPrt->GetEndPrintHdl();
 //TLPDF    if( rOpt.IsPrintSingleJobs()  )
 //TLPDF        pPrt->SetEndPrintHdl( Link() );
@@ -1159,11 +1161,11 @@ BOOL SwNewDBMgr::MergePrintDocuments( SwView& /*rView*/,
         {
 //TLPDF            if( pPrt->IsJobActive() || pPrt->StartJob( rOpt.GetJobName() ))
 //TLPDF            {
-                pSh->PrintProspectMM( aPrtAdaptor, rOpt, rOpt.IsPrintProspect_RTL() );
+                pSh->PrintProspectMM( pPrtController, rOpt, rOpt.IsPrintProspect_RTL() );
                 bRet = TRUE;
 //TLPDF            }
         }
-        else if( pSh->PrintOrPDFExportMM( aPrtAdaptor, rOpt ) /* TLPDF */ )
+        else if( pSh->PrintOrPDFExportMM( pPrtController, rOpt ) /* TLPDF */ )
             bRet = TRUE;
         bMergeLock = FALSE;
 
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index ab601c6926c3..9d51c50ae19e 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -51,6 +51,7 @@
 #include <sfx2/app.hxx>
 #include <svtools/flagitem.hxx>
 #include <vcl/msgbox.hxx>
+#include <vcl/oldprintadaptor.hxx>
 #include <svtools/printdlg.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/prnmon.hxx>
@@ -371,7 +372,7 @@ ErrCode SwView::DoPrint( SfxPrinter* pPrinter, PrintDialog* pDlg, BOOL bSilent,
             pViewProperties[10].Value <<= (text::NotePrintMode) aOpts.GetPrintPostIts();
             pViewProperties[11].Name = C2U("PrintProspect");
             pViewProperties[11].Value <<= (sal_Bool)aOpts.IsPrintProspect();
-            pViewProperties[12].Name = C2U("PrintPageBackground");
+                    pViewProperties[12].Name = C2U("PrintPageBackground");
             pViewProperties[12].Value <<= (sal_Bool)aOpts.IsPrintPageBackground();
             pViewProperties[13].Name = C2U("PrintBlackFonts");
             pViewProperties[13].Value <<= (sal_Bool)aOpts.IsPrintBlackFont();
@@ -390,14 +391,18 @@ ErrCode SwView::DoPrint( SfxPrinter* pPrinter, PrintDialog* pDlg, BOOL bSilent,
             SfxViewShell::Print(*pProgress, bIsAPI );
 //TLPDF           if ( !pProgress->IsAborted() )
             {
+                const boost::shared_ptr< Printer > pPrt( pPrinter );    // TLPDF
+                vcl::OldStylePrintAdaptor aPrtAdaptor( pPrt );          // TLPDF
+                const boost::shared_ptr< vcl::PrinterController > pPrtController( &aPrtAdaptor );
+
                 if( bPrtPros )
                 {
 //TLPDF                   bStartJob = pPrinter->StartJob( aOpts.GetJobName() );
 //TLPDF                 if( bStartJob )
-                       pSh->PrintProspectMM( aPrtAdaptor, aOpts, bPrtPros_RTL );  /* TLPDF */
+                    pSh->PrintProspectMM( pPrtController, aOpts, bPrtPros_RTL );  /* TLPDF */
                 }
                 else
-                    bStartJob = pSh->PrintOrPDFExportMM( aPrtAdaptor, aOpts );   /*TLPDF*/
+                    bStartJob = pSh->PrintOrPDFExportMM( pPrtController, aOpts );   /*TLPDF*/
 
                 if ( bBrowse )
                 {
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 135e0c05bc10..aa50d3f71372 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -360,7 +360,7 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell) :
     pxLinkTargetSupplier(0),
     pxXRedlines(0),
     m_pHiddenViewFrame(0),
-    m_pPrintUIOprions( NULL )
+    m_pPrintUIOptions( NULL )
 {
 }
 /*-- 18.12.98 11:53:00---------------------------------------------------
@@ -375,7 +375,7 @@ SwXTextDocument::~SwXTextDocument()
         xNumFmtAgg->setDelegator(x0);
         xNumFmtAgg = 0;
     }
-    delete m_pPrintUIOprions;
+    delete m_pPrintUIOptions;
 }
 
 
@@ -2608,13 +2608,13 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
     if(!IsValid())
         throw RuntimeException();
 
-    if( ! m_pPrintUIOprions )
+    if( ! m_pPrintUIOptions )
     {
         const BOOL bWebDoc    = (0 != PTR_CAST(SwWebDocShell,    pDocShell));
-        m_pPrintUIOprions = new SwPrintUIOptions( bWebDoc );
+        m_pPrintUIOptions = new SwPrintUIOptions( bWebDoc );
     }
-    bool bFormat = m_pPrintUIOprions->processPropertiesAndCheckFormat( rxOptions );
-    const bool bIsPDFExport     = !m_pPrintUIOprions->hasProperty( "IsPrinter" );
+    bool bFormat = m_pPrintUIOptions->processPropertiesAndCheckFormat( rxOptions );
+    const bool bIsPDFExport     = !m_pPrintUIOptions->hasProperty( "IsPrinter" );
 
     SfxViewShell *pView = 0;
     SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport );
@@ -2660,8 +2660,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
     OUString aPageRange;
     if (bIsPDFExport)
     {
-// TLPDF ??        m_pPrintUIOprions->getValue( C2U("Selection") );
-        aPageRange = m_pPrintUIOprions->getStringValue( "PageRange", OUString() );
+// TLPDF ??        m_pPrintUIOptions->getValue( C2U("Selection") );
+        aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() );
     }
     else
     {
@@ -2669,8 +2669,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
         // 0 -> print all pages
         // 1 -> print range according to PageRange
         // 2 -> print selection
-        if (1 == m_pPrintUIOprions->getIntValue( "PrintContent", 0 ))
-            aPageRange = m_pPrintUIOprions->getStringValue( "PageRange", OUString() );
+        if (1 == m_pPrintUIOptions->getIntValue( "PrintContent", 0 ))
+            aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() );
     }
     if (aPageRange.getLength() == 0)    // empty string -> print all
     {
@@ -2681,26 +2681,26 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
     }
 
     // get number of pages to be rendered
-    const bool bPrintProspect = m_pPrintUIOprions->getBoolValue( "PrintProspect", false );
+    const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false );
     if (bPrintProspect)
     {
-        pDoc->CalculatePagePairsForProspectPrinting( *m_pPrintUIOprions, nPageCount );
-        nRet = m_pPrintUIOprions->GetPagePairsForProspectPrinting().size();
+        pDoc->CalculatePagePairsForProspectPrinting( *m_pPrintUIOptions, nPageCount );
+        nRet = m_pPrintUIOptions->GetPagePairsForProspectPrinting().size();
     }
     else
     {
         // get set of valid pages (according to the current settings)
         // and their start frames
-        pDoc->CalculatePagesForPrinting( bIsPDFExport, *m_pPrintUIOprions, nPageCount );
+        pDoc->CalculatePagesForPrinting( bIsPDFExport, *m_pPrintUIOptions, nPageCount );
         DBG_ASSERT( nPageCount >= 1, "valid pages count is 0! Should not happen." );
 
         // get vector of pages to print according to PageRange and valid pages from above
         // (result may be an empty vector, for example if the range string is not correct)
         StringRangeEnumerator::getRangesFromString(
-                aPageRange, m_pPrintUIOprions->GetPagesToPrint(),
-                1, nPageCount, 0, &m_pPrintUIOprions->GetValidPagesSet() );
+                aPageRange, m_pPrintUIOptions->GetPagesToPrint(),
+                1, nPageCount, 0, &m_pPrintUIOptions->GetValidPagesSet() );
 
-        nRet = m_pPrintUIOprions->GetPagesToPrint().size();
+        nRet = m_pPrintUIOptions->GetPagesToPrint().size();
     }
     DBG_ASSERT( nRet >= 0, "negative number of pages???" );
 
@@ -2719,13 +2719,13 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
     if(!IsValid())
         throw RuntimeException();
 
-    if( ! m_pPrintUIOprions )
+    if( ! m_pPrintUIOptions )
     {
         const BOOL bWebDoc    = (0 != PTR_CAST(SwWebDocShell,    pDocShell));
         m_pPrintUIOptions = new SwPrintUIOptions( bWebDoc );
     }
     m_pPrintUIOptions->processProperties( rxOptions );
-    const bool bIsPDFExport = !m_pPrintUIOprions->hasProperty( "IsPrinter" );
+    const bool bIsPDFExport = !m_pPrintUIOptions->hasProperty( "IsPrinter" );
 
     SfxViewShell *pView = 0;
     SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport );
@@ -2740,12 +2740,12 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
     if (nRenderer >= pDoc->GetPageCount())
         return uno::Sequence< beans::PropertyValue >();
 
-    bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages();
+    bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport );
     Size aPgSize( pDoc->GetPageSize( sal_uInt16(nRenderer + 1), bIsSkipEmptyPages ) );
     awt::Size aPageSize( TWIP_TO_MM100( aPgSize.Width() ),
                          TWIP_TO_MM100( aPgSize.Height() ));
     // prospect printing should be landscape, thus switching width and height
-    if (m_pPrintUIOprions->getBoolValue( "PrintProspect", sal_False ))
+    if (m_pPrintUIOptions->getBoolValue( "PrintProspect", sal_False ))
         aPageSize = awt::Size( aPageSize.Height, aPageSize.Width );
     uno::Sequence< beans::PropertyValue > aRenderer(2);
     PropertyValue  &rValue = aRenderer.getArray()[0];
@@ -2754,7 +2754,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
     rValue.Name  = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageIncludesNonprintableArea" ) );
     rValue.Value <<= sal_False;
 
-    m_pPrintUIOprions->appendPrintUIOptions( aRenderer );
+    m_pPrintUIOptions->appendPrintUIOptions( aRenderer );
 
     return aRenderer;
 }
@@ -2811,14 +2811,14 @@ void SAL_CALL SwXTextDocument::render(
     if(!IsValid())
         throw RuntimeException();
 
-    if (!m_pPrintUIOprions)
+    if (!m_pPrintUIOptions)
     {
         const BOOL bWebDoc    = (0 != PTR_CAST(SwWebDocShell,    pDocShell));
-        m_pPrintUIOprions = new SwPrintUIOptions( bWebDoc );
+        m_pPrintUIOptions = new SwPrintUIOptions( bWebDoc );
     }
-    m_pPrintUIOprions->processProperties( rxOptions );
-    const bool bPrintProspect   = m_pPrintUIOprions->getBoolValue( "PrintProspect", false );
-    const bool bIsPDFExport     = !m_pPrintUIOprions->hasProperty( "IsPrinter" );
+    m_pPrintUIOptions->processProperties( rxOptions );
+    const bool bPrintProspect   = m_pPrintUIOptions->getBoolValue( "PrintProspect", false );
+    const bool bIsPDFExport     = !m_pPrintUIOptions->hasProperty( "IsPrinter" );
 
     // get view shell to use
     SfxViewShell *pView = 0;
@@ -2826,7 +2826,7 @@ void SAL_CALL SwXTextDocument::render(
         pView = GuessViewShell();
     else
     {
-        uno::Any aTmp( m_pPrintUIOprions->getValue( C2U( "View" ) ));
+        uno::Any aTmp( m_pPrintUIOptions->getValue( C2U( "View" ) ));
         uno::Reference< frame::XController > xController;
         if (aTmp >>= xController)
         {
@@ -2845,8 +2845,8 @@ void SAL_CALL SwXTextDocument::render(
     // Thus instead of throwing the exception we silently return.
     if (0 > nRenderer)
         throw IllegalArgumentException();
-    if ( (bPrintProspect && size_t(nRenderer) >= m_pPrintUIOprions->GetPagePairsForProspectPrinting().size())
-        || (!bPrintProspect && size_t(nRenderer) >= m_pPrintUIOprions->GetPagesToPrint().size()))
+    if ( (bPrintProspect && size_t(nRenderer) >= m_pPrintUIOptions->GetPagePairsForProspectPrinting().size())
+        || (!bPrintProspect && size_t(nRenderer) >= m_pPrintUIOptions->GetPagesToPrint().size()))
         return;
 
     // the view shell should be SwView for documents PDF export
@@ -2862,7 +2862,7 @@ void SAL_CALL SwXTextDocument::render(
                     ((SwPagePreView*)pView)->GetViewShell();
     }
 
-    uno::Any aAny( m_pPrintUIOprions->getValue( C2U( "RenderDevice" ) ));
+    uno::Any aAny( m_pPrintUIOptions->getValue( C2U( "RenderDevice" ) ));
     uno::Reference< awt::XDevice >  xRenderDevice;
     aAny >>= xRenderDevice;
 
@@ -2875,7 +2875,7 @@ void SAL_CALL SwXTextDocument::render(
 
     if(pVwSh && pOut)
     {
-        // TLPDF2DO: clean-up, need to check if only one of aOptions and m_pPrintUIOprions should be used
+        // TLPDF2DO: clean-up, need to check if only one of aOptions and m_pPrintUIOptions should be used
         SwPrtOptions    aOptions( C2U( bIsPDFExport ? "PDF export" : "Printing" ) );
 
         // get default print options
@@ -2884,33 +2884,33 @@ void SAL_CALL SwXTextDocument::render(
         SwView::MakeOptions( NULL, aOptions, NULL, NULL, bWeb, NULL, NULL );
 
         // get print options to use from provided properties
-        const rtl::OUString aPageRange  = m_pPrintUIOprions->getStringValue( "PageRange", OUString() );
-        const bool bFirstPage           = m_pPrintUIOprions->getBoolValue( "IsFirstPage", sal_False );
-        const bool bLastPage            = m_pPrintUIOprions->getBoolValue( "IsLastPage", sal_False );
-        bool bIsSkipEmptyPages          = !m_pPrintUIOprions->IsPrintEmptyPages( bIsPDFExport );
-        aOptions.bPrintGraphic          = m_pPrintUIOprions->IsPrintGraphics();
-        aOptions.bPrintTable            = m_pPrintUIOprions->IsPrintTables();
-        aOptions.bPrintDraw             = m_pPrintUIOprions->IsPrintDrawings();
-        aOptions.bPrintControl          = m_pPrintUIOprions->getBoolValue( "PrintControls", aOptions.bPrintControl );
-        aOptions.bPrintLeftPage         = m_pPrintUIOprions->IsPrintLeftPages();
-        aOptions.bPrintRightPage        = m_pPrintUIOprions->IsPrintRigthPages();
-        aOptions.bPrintPageBackground   = m_pPrintUIOprions->getBoolValue( "PrintPageBackground",   aOptions.bPrintPageBackground );
+        const rtl::OUString aPageRange  = m_pPrintUIOptions->getStringValue( "PageRange", OUString() );
+        const bool bFirstPage           = m_pPrintUIOptions->getBoolValue( "IsFirstPage", sal_False );
+        const bool bLastPage            = m_pPrintUIOptions->getBoolValue( "IsLastPage", sal_False );
+        bool bIsSkipEmptyPages          = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport );
+        aOptions.bPrintGraphic          = m_pPrintUIOptions->IsPrintGraphics();
+        aOptions.bPrintTable            = m_pPrintUIOptions->IsPrintTables();
+        aOptions.bPrintDraw             = m_pPrintUIOptions->IsPrintDrawings();
+        aOptions.bPrintControl          = m_pPrintUIOptions->getBoolValue( "PrintControls", aOptions.bPrintControl );
+        aOptions.bPrintLeftPage         = m_pPrintUIOptions->IsPrintLeftPages();
+        aOptions.bPrintRightPage        = m_pPrintUIOptions->IsPrintRightPages();
+        aOptions.bPrintPageBackground   = m_pPrintUIOptions->getBoolValue( "PrintPageBackground",   aOptions.bPrintPageBackground );
         aOptions.bPrintEmptyPages       = !bIsSkipEmptyPages;
         // bUpdateFieldsInPrinting  <-- not set here    // TLPDF: TODO: remove this from SwPrintData?? Get rid of SwPrtOptions??
-        aOptions.bPaperFromSetup        = m_pPrintUIOprions->getBoolValue( "PrintPaperFromSetup",   aOptions.bPaperFromSetup );
-        aOptions.bPrintReverse          = m_pPrintUIOprions->getBoolValue( "PrintReversed",         aOptions.bPrintReverse );
-        aOptions.bPrintProspect         = m_pPrintUIOprions->getBoolValue( "PrintProspect",         aOptions.bPrintProspect );
-        aOptions.bPrintProspect_RTL     = m_pPrintUIOprions->getIntValue( "PrintProspectRTL",       aOptions.bPrintProspect_RTL ) ? true : false;
+        aOptions.bPaperFromSetup        = m_pPrintUIOptions->getBoolValue( "PrintPaperFromSetup",   aOptions.bPaperFromSetup );
+        aOptions.bPrintReverse          = m_pPrintUIOptions->getBoolValue( "PrintReversed",         aOptions.bPrintReverse );
+        aOptions.bPrintProspect         = m_pPrintUIOptions->getBoolValue( "PrintProspect",         aOptions.bPrintProspect );
+        aOptions.bPrintProspect_RTL     = m_pPrintUIOptions->getIntValue( "PrintProspectRTL",       aOptions.bPrintProspect_RTL ) ? true : false;
         // bPrintSingleJobs         <-- not set here    // TLPDF: TODO: remove this from SwPrintData?? Get rid of SwPrtOptions??
         // bModified                <-- not set here    // TLPDF: TODO: remove this from SwPrintData?? Get rid of SwPrtOptions??
-        aOptions.bPrintBlackFont        = m_pPrintUIOprions->getBoolValue( "PrintBlackFonts",       aOptions.bPrintBlackFont );
-        aOptions.bPrintHiddenText       = m_pPrintUIOprions->getBoolValue( "PrintHiddenText",       aOptions.bPrintHiddenText );
-        aOptions.bPrintTextPlaceholder  = m_pPrintUIOprions->getBoolValue( "PrintTextPlaceholder",  aOptions.bPrintTextPlaceholder );
-        aOptions.nPrintPostIts          = static_cast< sal_Int16 >(m_pPrintUIOprions->getIntValue( "PrintAnnotationMode", aOptions.nPrintPostIts ));
+        aOptions.bPrintBlackFont        = m_pPrintUIOptions->getBoolValue( "PrintBlackFonts",       aOptions.bPrintBlackFont );
+        aOptions.bPrintHiddenText       = m_pPrintUIOptions->getBoolValue( "PrintHiddenText",       aOptions.bPrintHiddenText );
+        aOptions.bPrintTextPlaceholder  = m_pPrintUIOptions->getBoolValue( "PrintTextPlaceholder",  aOptions.bPrintTextPlaceholder );
+        aOptions.nPrintPostIts          = static_cast< sal_Int16 >(m_pPrintUIOptions->getIntValue( "PrintAnnotationMode", aOptions.nPrintPostIts ));
 
         //! needs to be set after MakeOptions since the assingment operation in that
         //! function will destroy this pointer
-        aOptions.SetPrintUIOptions( m_pPrintUIOprions );
+        aOptions.SetPrintUIOptions( m_pPrintUIOptions );
 
         Range aRange( nRenderer+1, nRenderer+1 );
         MultiSelection aPages( aRange );
@@ -2980,7 +2980,7 @@ void SAL_CALL SwXTextDocument::render(
                 m_pHiddenViewFrame = 0;
             }
             aOptions.SetPrintUIOptions( NULL );
-            delete m_pPrintUIOprions, m_pPrintUIOprions = NULL;
+            delete m_pPrintUIOptions, m_pPrintUIOptions = NULL;
         }
     }
 }