Skip to content

C
core
Kaydet (Commit) f9fd800b authored tarafından Pierre-André Jacquod's avatar Pierre-André Jacquod
Dosyalara gözat
Seçenekler

fdo43033 do not export to PDF hidden slides

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