fdo43033 do not export to PDF hidden slides

1 files changed, 250 insertions, 247 deletions

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 1a49b7f97fa5..1f75de0435cc 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1824,321 +1824,324 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
             {
                 vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST( vcl::PDFExtOutDevData, pOut->GetExtOutDevData() );
 
-                ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL );
-                Rectangle               aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() );
-                Region                  aRegion( aVisArea );
-                Point                   aOrigin;
-
-                ::sd::ViewShell* pOldViewSh = mpDocShell->GetViewShell();
-                ::sd::View* pOldSdView = pOldViewSh ? pOldViewSh->GetView() : NULL;
+                if ( !( (mpDoc->GetSdPage((sal_Int16) nPageNumber-1, PK_STANDARD))->IsExcluded() ) )
+                {
+                    ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL );
+                    Rectangle               aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() );
+                    Region                  aRegion( aVisArea );
+                    Point                   aOrigin;
 
-                if  ( pOldSdView )
-                    pOldSdView->SdrEndTextEdit();
+                    ::sd::ViewShell* pOldViewSh = mpDocShell->GetViewShell();
+                    ::sd::View* pOldSdView = pOldViewSh ? pOldViewSh->GetView() : NULL;
 
-                pView->SetHlplVisible( sal_False );
-                pView->SetGridVisible( sal_False );
-                pView->SetBordVisible( sal_False );
-                pView->SetPageVisible( sal_False );
-                pView->SetGlueVisible( sal_False );
+                    if  ( pOldSdView )
+                        pOldSdView->SdrEndTextEdit();
 
-                pOut->SetMapMode( MAP_100TH_MM );
-                pOut->IntersectClipRegion( aVisArea );
+                    pView->SetHlplVisible( sal_False );
+                    pView->SetGridVisible( sal_False );
+                    pView->SetBordVisible( sal_False );
+                    pView->SetPageVisible( sal_False );
+                    pView->SetGlueVisible( sal_False );
 
+                    pOut->SetMapMode( MAP_100TH_MM );
+                    pOut->IntersectClipRegion( aVisArea );
 
 
-                uno::Reference< frame::XModel > xModel;
-                rSelection >>= xModel;
 
-                if( xModel == mpDocShell->GetModel() )
-                {
-                    pView->ShowSdrPage( mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind ));
-                    SdrPageView* pPV = pView->GetSdrPageView();
+                    uno::Reference< frame::XModel > xModel;
+                    rSelection >>= xModel;
 
-                    if( pOldSdView )
+                    if( xModel == mpDocShell->GetModel() )
                     {
-                        SdrPageView* pOldPV = pOldSdView->GetSdrPageView();
-                        if( pPV && pOldPV )
+                        pView->ShowSdrPage( mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind ));
+                        SdrPageView* pPV = pView->GetSdrPageView();
+
+                        if( pOldSdView )
                         {
-                            pPV->SetVisibleLayers( pOldPV->GetVisibleLayers() );
-                            pPV->SetPrintableLayers( pOldPV->GetPrintableLayers() );
+                            SdrPageView* pOldPV = pOldSdView->GetSdrPageView();
+                            if( pPV && pOldPV )
+                            {
+                                pPV->SetVisibleLayers( pOldPV->GetVisibleLayers() );
+                                pPV->SetPrintableLayers( pOldPV->GetPrintableLayers() );
+                            }
                         }
-                    }
 
-                    ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(),
-                        pPV, pPDFExtOutDevData );
+                        ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(),
+                            pPV, pPDFExtOutDevData );
 
-                    // background color for outliner :o
-                    SdPage* pPage = (SdPage*)pPV->GetPage();
-                    if( pPage )
-                    {
-                        SdrOutliner& rOutl = mpDoc->GetDrawOutliner( NULL );
-                        bool bScreenDisplay(true);
-
-                        if(bScreenDisplay && pOut && OUTDEV_PRINTER == pOut->GetOutDevType())
+                        // background color for outliner :o
+                        SdPage* pPage = (SdPage*)pPV->GetPage();
+                        if( pPage )
                         {
-                            // #i75566# printing; suppress AutoColor BackgroundColor generation
-                            // for visibility reasons by giving GetPageBackgroundColor()
-                            // the needed hint
-                            bScreenDisplay = false;
-                        }
+                            SdrOutliner& rOutl = mpDoc->GetDrawOutliner( NULL );
+                            bool bScreenDisplay(true);
 
-                        if(bScreenDisplay && pOut && pOut->GetPDFWriter())
-                        {
-                            // #i75566# PDF export; suppress AutoColor BackgroundColor generation (see above)
-                            bScreenDisplay = false;
-                        }
+                            if(bScreenDisplay && pOut && OUTDEV_PRINTER == pOut->GetOutDevType())
+                            {
+                                // #i75566# printing; suppress AutoColor BackgroundColor generation
+                                // for visibility reasons by giving GetPageBackgroundColor()
+                                // the needed hint
+                                bScreenDisplay = false;
+                            }
 
-                        // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and
-                        // hint value if screen display. Only then the AutoColor mechanisms shall be applied
-                        rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor( pPV, bScreenDisplay ) );
-                    }
-                    pView->SdrPaintView::CompleteRedraw( pOut, aRegion, &aImplRenderPaintProc );
+                            if(bScreenDisplay && pOut && pOut->GetPDFWriter())
+                            {
+                                // #i75566# PDF export; suppress AutoColor BackgroundColor generation (see above)
+                                bScreenDisplay = false;
+                            }
 
-                    if ( pPDFExtOutDevData )
-                    {
-                        try
+                            // #i75566# Name change GetBackgroundColor -> GetPageBackgroundColor and
+                            // hint value if screen display. Only then the AutoColor mechanisms shall be applied
+                            rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor( pPV, bScreenDisplay ) );
+                        }
+                        pView->SdrPaintView::CompleteRedraw( pOut, aRegion, &aImplRenderPaintProc );
+
+                        if ( pPDFExtOutDevData )
                         {
-                            uno::Any aAny;
-                            uno::Reference< drawing::XDrawPage > xPage( uno::Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ) );
-                            if ( xPage.is() )
+                            try
                             {
-                                if ( pPDFExtOutDevData->GetIsExportNotes() )
-                                    ImplPDFExportComments( xPage, *pPDFExtOutDevData );
-                                uno::Reference< beans::XPropertySet > xPagePropSet( xPage, uno::UNO_QUERY );
-                                if( xPagePropSet.is() )
+                                uno::Any aAny;
+                                uno::Reference< drawing::XDrawPage > xPage( uno::Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ) );
+                                if ( xPage.is() )
                                 {
-                                    // exporting object interactions to pdf
-
-                                    // if necessary, the master page interactions will be exported first
-                                    sal_Bool bIsBackgroundObjectsVisible = sal_False;   // #i39428# IsBackgroundObjectsVisible not available for Draw
-                                    const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) );
-                                    if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sIsBackgroundObjectsVisible ) )
-                                        xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible;
-                                    if ( mbImpressDoc && bIsBackgroundObjectsVisible && !pPDFExtOutDevData->GetIsExportNotesPages() )
+                                    if ( pPDFExtOutDevData->GetIsExportNotes() )
+                                        ImplPDFExportComments( xPage, *pPDFExtOutDevData );
+                                    uno::Reference< beans::XPropertySet > xPagePropSet( xPage, uno::UNO_QUERY );
+                                    if( xPagePropSet.is() )
                                     {
-                                        uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( xPage, uno::UNO_QUERY );
-                                        if ( xMasterPageTarget.is() )
+                                        // exporting object interactions to pdf
+
+                                        // if necessary, the master page interactions will be exported first
+                                        sal_Bool bIsBackgroundObjectsVisible = sal_False;   // #i39428# IsBackgroundObjectsVisible not available for Draw
+                                        const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) );
+                                        if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sIsBackgroundObjectsVisible ) )
+                                            xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible;
+                                        if ( mbImpressDoc && bIsBackgroundObjectsVisible && !pPDFExtOutDevData->GetIsExportNotesPages() )
                                         {
-                                            uno::Reference< drawing::XDrawPage > xMasterPage = xMasterPageTarget->getMasterPage();
-                                            if ( xMasterPage.is() )
+                                            uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( xPage, uno::UNO_QUERY );
+                                            if ( xMasterPageTarget.is() )
                                             {
-                                                uno::Reference< drawing::XShapes> xShapes( xMasterPage, uno::UNO_QUERY );
-                                                sal_Int32 i, nCount = xShapes->getCount();
-                                                for ( i = 0; i < nCount; i++ )
+                                                uno::Reference< drawing::XDrawPage > xMasterPage = xMasterPageTarget->getMasterPage();
+                                                if ( xMasterPage.is() )
                                                 {
-                                                    aAny = xShapes->getByIndex( i );
-                                                    uno::Reference< drawing::XShape > xShape;
-                                                    if ( aAny >>= xShape )
-                                                        ImplPDFExportShapeInteraction( xShape, *mpDoc, *pPDFExtOutDevData );
+                                                    uno::Reference< drawing::XShapes> xShapes( xMasterPage, uno::UNO_QUERY );
+                                                    sal_Int32 i, nCount = xShapes->getCount();
+                                                    for ( i = 0; i < nCount; i++ )
+                                                    {
+                                                        aAny = xShapes->getByIndex( i );
+                                                        uno::Reference< drawing::XShape > xShape;
+                                                        if ( aAny >>= xShape )
+                                                            ImplPDFExportShapeInteraction( xShape, *mpDoc, *pPDFExtOutDevData );
+                                                    }
                                                 }
                                             }
                                         }
-                                    }
 
-                                    // exporting slide page object interactions
-                                    uno::Reference< drawing::XShapes> xShapes( xPage, uno::UNO_QUERY );
-                                    sal_Int32 i, nCount = xShapes->getCount();
-                                    for ( i = 0; i < nCount; i++ )
-                                    {
-                                        aAny = xShapes->getByIndex( i );
-                                        uno::Reference< drawing::XShape > xShape;
-                                        if ( aAny >>= xShape )
-                                            ImplPDFExportShapeInteraction( xShape, *mpDoc, *pPDFExtOutDevData );
-                                    }
+                                        // exporting slide page object interactions
+                                        uno::Reference< drawing::XShapes> xShapes( xPage, uno::UNO_QUERY );
+                                        sal_Int32 i, nCount = xShapes->getCount();
+                                        for ( i = 0; i < nCount; i++ )
+                                        {
+                                            aAny = xShapes->getByIndex( i );
+                                            uno::Reference< drawing::XShape > xShape;
+                                            if ( aAny >>= xShape )
+                                                ImplPDFExportShapeInteraction( xShape, *mpDoc, *pPDFExtOutDevData );
+                                        }
 
-                                    // exporting transition effects to pdf
-                                    if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() )
-                                    {
-                                        const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) );
-                                        const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) );
-                                        sal_Int32 nTime = 800;
-                                        presentation::AnimationSpeed aAs;
-                                        if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) )
+                                        // exporting transition effects to pdf
+                                        if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() )
                                         {
-                                            aAny = xPagePropSet->getPropertyValue( sSpeed );
-                                            if ( aAny >>= aAs )
+                                            const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) );
+                                            const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) );
+                                            sal_Int32 nTime = 800;
+                                            presentation::AnimationSpeed aAs;
+                                            if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) )
                                             {
-                                                switch( aAs )
+                                                aAny = xPagePropSet->getPropertyValue( sSpeed );
+                                                if ( aAny >>= aAs )
                                                 {
-                                                    case presentation::AnimationSpeed_SLOW : nTime = 1500; break;
-                                                    case presentation::AnimationSpeed_FAST : nTime = 300; break;
-                                                    default:
-                                                    case presentation::AnimationSpeed_MEDIUM : nTime = 800;
+                                                    switch( aAs )
+                                                    {
+                                                        case presentation::AnimationSpeed_SLOW : nTime = 1500; break;
+                                                        case presentation::AnimationSpeed_FAST : nTime = 300; break;
+                                                        default:
+                                                        case presentation::AnimationSpeed_MEDIUM : nTime = 800;
+                                                    }
                                                 }
                                             }
-                                        }
-                                        presentation::FadeEffect eFe;
-                                        vcl::PDFWriter::PageTransition eType = vcl::PDFWriter::Regular;
-                                        if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sEffect ) )
-                                        {
-                                            aAny = xPagePropSet->getPropertyValue( sEffect );
-                                            if ( aAny >>= eFe )
+                                            presentation::FadeEffect eFe;
+                                            vcl::PDFWriter::PageTransition eType = vcl::PDFWriter::Regular;
+                                            if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sEffect ) )
                                             {
-                                                switch( eFe )
+                                                aAny = xPagePropSet->getPropertyValue( sEffect );
+                                                if ( aAny >>= eFe )
                                                 {
-                                                    case presentation::FadeEffect_HORIZONTAL_LINES :
-                                                    case presentation::FadeEffect_HORIZONTAL_CHECKERBOARD :
-                                                    case presentation::FadeEffect_HORIZONTAL_STRIPES : eType = vcl::PDFWriter::BlindsHorizontal; break;
-
-                                                    case presentation::FadeEffect_VERTICAL_LINES :
-                                                    case presentation::FadeEffect_VERTICAL_CHECKERBOARD :
-                                                    case presentation::FadeEffect_VERTICAL_STRIPES : eType = vcl::PDFWriter::BlindsVertical; break;
-
-                                                    case presentation::FadeEffect_UNCOVER_TO_RIGHT :
-                                                    case presentation::FadeEffect_UNCOVER_TO_UPPERRIGHT :
-                                                    case presentation::FadeEffect_ROLL_FROM_LEFT :
-                                                    case presentation::FadeEffect_FADE_FROM_UPPERLEFT :
-                                                    case presentation::FadeEffect_MOVE_FROM_UPPERLEFT :
-                                                    case presentation::FadeEffect_FADE_FROM_LEFT :
-                                                    case presentation::FadeEffect_MOVE_FROM_LEFT : eType = vcl::PDFWriter::WipeLeftToRight; break;
-
-                                                    case presentation::FadeEffect_UNCOVER_TO_BOTTOM :
-                                                    case presentation::FadeEffect_UNCOVER_TO_LOWERRIGHT :
-                                                    case presentation::FadeEffect_ROLL_FROM_TOP :
-                                                    case presentation::FadeEffect_FADE_FROM_UPPERRIGHT :
-                                                    case presentation::FadeEffect_MOVE_FROM_UPPERRIGHT :
-                                                    case presentation::FadeEffect_FADE_FROM_TOP :
-                                                    case presentation::FadeEffect_MOVE_FROM_TOP : eType = vcl::PDFWriter::WipeTopToBottom; break;
-
-                                                    case presentation::FadeEffect_UNCOVER_TO_LEFT :
-                                                    case presentation::FadeEffect_UNCOVER_TO_LOWERLEFT :
-                                                    case presentation::FadeEffect_ROLL_FROM_RIGHT :
-
-                                                    case presentation::FadeEffect_FADE_FROM_LOWERRIGHT :
-                                                    case presentation::FadeEffect_MOVE_FROM_LOWERRIGHT :
-                                                    case presentation::FadeEffect_FADE_FROM_RIGHT :
-                                                    case presentation::FadeEffect_MOVE_FROM_RIGHT : eType = vcl::PDFWriter::WipeRightToLeft; break;
-
-                                                    case presentation::FadeEffect_UNCOVER_TO_TOP :
-                                                    case presentation::FadeEffect_UNCOVER_TO_UPPERLEFT :
-                                                    case presentation::FadeEffect_ROLL_FROM_BOTTOM :
-                                                    case presentation::FadeEffect_FADE_FROM_LOWERLEFT :
-                                                    case presentation::FadeEffect_MOVE_FROM_LOWERLEFT :
-                                                    case presentation::FadeEffect_FADE_FROM_BOTTOM :
-                                                    case presentation::FadeEffect_MOVE_FROM_BOTTOM : eType = vcl::PDFWriter::WipeBottomToTop; break;
-
-                                                    case presentation::FadeEffect_OPEN_VERTICAL : eType = vcl::PDFWriter::SplitHorizontalInward; break;
-                                                    case presentation::FadeEffect_CLOSE_HORIZONTAL : eType = vcl::PDFWriter::SplitHorizontalOutward; break;
-
-                                                    case presentation::FadeEffect_OPEN_HORIZONTAL : eType = vcl::PDFWriter::SplitVerticalInward; break;
-                                                    case presentation::FadeEffect_CLOSE_VERTICAL : eType = vcl::PDFWriter::SplitVerticalOutward; break;
-
-                                                    case presentation::FadeEffect_FADE_TO_CENTER : eType = vcl::PDFWriter::BoxInward; break;
-                                                    case presentation::FadeEffect_FADE_FROM_CENTER : eType = vcl::PDFWriter::BoxOutward; break;
-
-                                                    case presentation::FadeEffect_NONE : eType = vcl::PDFWriter::Regular; break;
-
-                                                    case presentation::FadeEffect_RANDOM :
-                                                    case presentation::FadeEffect_DISSOLVE :
-                                                    default: eType = vcl::PDFWriter::Dissolve; break;
+                                                    switch( eFe )
+                                                    {
+                                                        case presentation::FadeEffect_HORIZONTAL_LINES :
+                                                        case presentation::FadeEffect_HORIZONTAL_CHECKERBOARD :
+                                                        case presentation::FadeEffect_HORIZONTAL_STRIPES : eType = vcl::PDFWriter::BlindsHorizontal; break;
+
+                                                        case presentation::FadeEffect_VERTICAL_LINES :
+                                                        case presentation::FadeEffect_VERTICAL_CHECKERBOARD :
+                                                        case presentation::FadeEffect_VERTICAL_STRIPES : eType = vcl::PDFWriter::BlindsVertical; break;
+
+                                                        case presentation::FadeEffect_UNCOVER_TO_RIGHT :
+                                                        case presentation::FadeEffect_UNCOVER_TO_UPPERRIGHT :
+                                                        case presentation::FadeEffect_ROLL_FROM_LEFT :
+                                                        case presentation::FadeEffect_FADE_FROM_UPPERLEFT :
+                                                        case presentation::FadeEffect_MOVE_FROM_UPPERLEFT :
+                                                        case presentation::FadeEffect_FADE_FROM_LEFT :
+                                                        case presentation::FadeEffect_MOVE_FROM_LEFT : eType = vcl::PDFWriter::WipeLeftToRight; break;
+
+                                                        case presentation::FadeEffect_UNCOVER_TO_BOTTOM :
+                                                        case presentation::FadeEffect_UNCOVER_TO_LOWERRIGHT :
+                                                        case presentation::FadeEffect_ROLL_FROM_TOP :
+                                                        case presentation::FadeEffect_FADE_FROM_UPPERRIGHT :
+                                                        case presentation::FadeEffect_MOVE_FROM_UPPERRIGHT :
+                                                        case presentation::FadeEffect_FADE_FROM_TOP :
+                                                        case presentation::FadeEffect_MOVE_FROM_TOP : eType = vcl::PDFWriter::WipeTopToBottom; break;
+
+                                                        case presentation::FadeEffect_UNCOVER_TO_LEFT :
+                                                        case presentation::FadeEffect_UNCOVER_TO_LOWERLEFT :
+                                                        case presentation::FadeEffect_ROLL_FROM_RIGHT :
+
+                                                        case presentation::FadeEffect_FADE_FROM_LOWERRIGHT :
+                                                        case presentation::FadeEffect_MOVE_FROM_LOWERRIGHT :
+                                                        case presentation::FadeEffect_FADE_FROM_RIGHT :
+                                                        case presentation::FadeEffect_MOVE_FROM_RIGHT : eType = vcl::PDFWriter::WipeRightToLeft; break;
+
+                                                        case presentation::FadeEffect_UNCOVER_TO_TOP :
+                                                        case presentation::FadeEffect_UNCOVER_TO_UPPERLEFT :
+                                                        case presentation::FadeEffect_ROLL_FROM_BOTTOM :
+                                                        case presentation::FadeEffect_FADE_FROM_LOWERLEFT :
+                                                        case presentation::FadeEffect_MOVE_FROM_LOWERLEFT :
+                                                        case presentation::FadeEffect_FADE_FROM_BOTTOM :
+                                                        case presentation::FadeEffect_MOVE_FROM_BOTTOM : eType = vcl::PDFWriter::WipeBottomToTop; break;
+
+                                                        case presentation::FadeEffect_OPEN_VERTICAL : eType = vcl::PDFWriter::SplitHorizontalInward; break;
+                                                        case presentation::FadeEffect_CLOSE_HORIZONTAL : eType = vcl::PDFWriter::SplitHorizontalOutward; break;
+
+                                                        case presentation::FadeEffect_OPEN_HORIZONTAL : eType = vcl::PDFWriter::SplitVerticalInward; break;
+                                                        case presentation::FadeEffect_CLOSE_VERTICAL : eType = vcl::PDFWriter::SplitVerticalOutward; break;
+
+                                                        case presentation::FadeEffect_FADE_TO_CENTER : eType = vcl::PDFWriter::BoxInward; break;
+                                                        case presentation::FadeEffect_FADE_FROM_CENTER : eType = vcl::PDFWriter::BoxOutward; break;
+
+                                                        case presentation::FadeEffect_NONE : eType = vcl::PDFWriter::Regular; break;
+
+                                                        case presentation::FadeEffect_RANDOM :
+                                                        case presentation::FadeEffect_DISSOLVE :
+                                                        default: eType = vcl::PDFWriter::Dissolve; break;
+                                                    }
                                                 }
                                             }
-                                        }
 
-                                        if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sEffect ) ||
-                                             xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) )
-                                        {
-                                             pPDFExtOutDevData->SetPageTransition( eType, nTime, -1 );
+                                            if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sEffect ) ||
+                                                xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) )
+                                            {
+                                                pPDFExtOutDevData->SetPageTransition( eType, nTime, -1 );
+                                            }
                                         }
                                     }
                                 }
-                            }
 
-                            Size        aPageSize( mpDoc->GetSdPage( 0, PK_STANDARD )->GetSize() );
-                            Point aPoint( 0, 0 );
-                            Rectangle   aPageRect( aPoint, aPageSize );
+                                Size        aPageSize( mpDoc->GetSdPage( 0, PK_STANDARD )->GetSize() );
+                                Point aPoint( 0, 0 );
+                                Rectangle   aPageRect( aPoint, aPageSize );
 
-                            // resolving links found in this page by the method ImpEditEngine::Paint
-                            std::vector< vcl::PDFExtOutDevBookmarkEntry >& rBookmarks = pPDFExtOutDevData->GetBookmarks();
-                            std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIBeg = rBookmarks.begin();
-                            std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIEnd = rBookmarks.end();
-                            while ( aIBeg != aIEnd )
-                            {
-                                sal_Int32 nPage = ImplPDFGetBookmarkPage( aIBeg->aBookmark, *mpDoc );
-                                if ( nPage != -1 )
+                                // resolving links found in this page by the method ImpEditEngine::Paint
+                                std::vector< vcl::PDFExtOutDevBookmarkEntry >& rBookmarks = pPDFExtOutDevData->GetBookmarks();
+                                std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIBeg = rBookmarks.begin();
+                                std::vector< vcl::PDFExtOutDevBookmarkEntry >::iterator aIEnd = rBookmarks.end();
+                                while ( aIBeg != aIEnd )
                                 {
-                                    if ( aIBeg->nLinkId != -1 )
-                                        pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+                                    sal_Int32 nPage = ImplPDFGetBookmarkPage( aIBeg->aBookmark, *mpDoc );
+                                    if ( nPage != -1 )
+                                    {
+                                        if ( aIBeg->nLinkId != -1 )
+                                            pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+                                        else
+                                            pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, aPageRect, nPage, vcl::PDFWriter::FitRectangle );
+                                    }
                                     else
-                                        pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, aPageRect, nPage, vcl::PDFWriter::FitRectangle );
+                                        pPDFExtOutDevData->SetLinkURL( aIBeg->nLinkId, aIBeg->aBookmark );
+                                    ++aIBeg;
                                 }
-                                else
-                                    pPDFExtOutDevData->SetLinkURL( aIBeg->nLinkId, aIBeg->aBookmark );
-                                ++aIBeg;
-                            }
-                            rBookmarks.clear();
-                            //---> #i56629, #i40318
-                            //get the page name, will be used as outline element in PDF bookmark pane
-                            String aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName();
-                            if( aPageName.Len() > 0 )
-                            {
-                                // insert the bookmark to this page into the NamedDestinations
-                                if( pPDFExtOutDevData->GetIsExportNamedDestinations() )
-                                    pPDFExtOutDevData->CreateNamedDest( aPageName, aPageRect,  nPageNumber - 1 );
-                                //
-                                // add the name to the outline, (almost) same code as in sc/source/ui/unoobj/docuno.cxx
-                                // issue #i40318.
-                                //
-                                if( pPDFExtOutDevData->GetIsExportBookmarks() )
+                                rBookmarks.clear();
+                                //---> #i56629, #i40318
+                                //get the page name, will be used as outline element in PDF bookmark pane
+                                String aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName();
+                                if( aPageName.Len() > 0 )
                                 {
-                                    // Destination Export
-                                    const sal_Int32 nDestId =
-                                        pPDFExtOutDevData->CreateDest( aPageRect , nPageNumber - 1 );
+                                    // insert the bookmark to this page into the NamedDestinations
+                                    if( pPDFExtOutDevData->GetIsExportNamedDestinations() )
+                                        pPDFExtOutDevData->CreateNamedDest( aPageName, aPageRect,  nPageNumber - 1 );
+                                    //
+                                    // add the name to the outline, (almost) same code as in sc/source/ui/unoobj/docuno.cxx
+                                    // issue #i40318.
+                                    //
+                                    if( pPDFExtOutDevData->GetIsExportBookmarks() )
+                                    {
+                                        // Destination Export
+                                        const sal_Int32 nDestId =
+                                            pPDFExtOutDevData->CreateDest( aPageRect , nPageNumber - 1 );
 
-                                    // Create a new outline item:
-                                    pPDFExtOutDevData->CreateOutlineItem( -1 , aPageName, nDestId );
+                                        // Create a new outline item:
+                                        pPDFExtOutDevData->CreateOutlineItem( -1 , aPageName, nDestId );
+                                    }
                                 }
+                                //<--- #i56629, #i40318
+                            }
+                            catch (const uno::Exception&)
+                            {
                             }
-                            //<--- #i56629, #i40318
-                        }
-                        catch (const uno::Exception&)
-                        {
-                        }
 
+                        }
                     }
-                }
-                else
-                {
-                    uno::Reference< drawing::XShapes > xShapes;
-                    rSelection >>= xShapes;
-
-                    if( xShapes.is() && xShapes->getCount() )
+                    else
                     {
-                       SdrPageView* pPV = NULL;
+                        uno::Reference< drawing::XShapes > xShapes;
+                        rSelection >>= xShapes;
 
-                       ImplRenderPaintProc  aImplRenderPaintProc( mpDoc->GetLayerAdmin(),
-                                        pOldSdView ? pOldSdView->GetSdrPageView() : NULL, pPDFExtOutDevData );
-
-                        for( sal_uInt32 i = 0, nCount = xShapes->getCount(); i < nCount; i++ )
+                        if( xShapes.is() && xShapes->getCount() )
                         {
-                            uno::Reference< drawing::XShape > xShape;
-                            xShapes->getByIndex( i ) >>= xShape;
+                        SdrPageView* pPV = NULL;
+
+                        ImplRenderPaintProc  aImplRenderPaintProc( mpDoc->GetLayerAdmin(),
+                                            pOldSdView ? pOldSdView->GetSdrPageView() : NULL, pPDFExtOutDevData );
 
-                            if( xShape.is() )
+                            for( sal_uInt32 i = 0, nCount = xShapes->getCount(); i < nCount; i++ )
                             {
-                                SvxShape* pShape = SvxShape::getImplementation( xShape );
+                                uno::Reference< drawing::XShape > xShape;
+                                xShapes->getByIndex( i ) >>= xShape;
 
-                                if( pShape )
+                                if( xShape.is() )
                                 {
-                                    SdrObject* pObj = pShape->GetSdrObject();
-                                    if( pObj && pObj->GetPage()
-                                        && aImplRenderPaintProc.IsVisible( pObj )
-                                            && aImplRenderPaintProc.IsPrintable( pObj ) )
+                                    SvxShape* pShape = SvxShape::getImplementation( xShape );
+
+                                    if( pShape )
                                     {
-                                        if( !pPV )
-                                            pPV = pView->ShowSdrPage( pObj->GetPage() );
+                                        SdrObject* pObj = pShape->GetSdrObject();
+                                        if( pObj && pObj->GetPage()
+                                            && aImplRenderPaintProc.IsVisible( pObj )
+                                                && aImplRenderPaintProc.IsPrintable( pObj ) )
+                                        {
+                                            if( !pPV )
+                                                pPV = pView->ShowSdrPage( pObj->GetPage() );
 
-                                        if( pPV )
-                                            pView->MarkObj( pObj, pPV );
+                                            if( pPV )
+                                                pView->MarkObj( pObj, pPV );
+                                        }
                                     }
                                 }
                             }
+                            pView->DrawMarkedObj(*pOut);
                         }
-                        pView->DrawMarkedObj(*pOut);
                     }
-                }
 
-                delete pView;
+                    delete pView;
+                }
             }
         }
     }