summaryrefslogtreecommitdiff
path: root/sd/source/filter/grf/sdgrffilter.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter/grf/sdgrffilter.cxx')
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx179
1 files changed, 84 insertions, 95 deletions
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 8a4ac2f07197..e8df14893f61 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -21,6 +21,7 @@
#ifdef _MSC_VER
#pragma warning (disable:4190)
#endif
+#include <com/sun/star/drawing/GraphicExportFilter.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/graphic/GraphicType.hpp>
@@ -255,112 +256,100 @@ sal_Bool SdGRFFilter::Export()
sal_Bool bRet = sal_False;
- uno::Reference< lang::XMultiServiceFactory >
- xSMgr( ::comphelper::getProcessServiceFactory() );
- uno::Reference< uno::XInterface > xComponent
- ( xSMgr->createInstance( "com.sun.star.drawing.GraphicExportFilter" ),
- uno::UNO_QUERY );
- if ( xComponent.is() )
- {
- uno::Reference< document::XExporter > xExporter
- ( xComponent, uno::UNO_QUERY );
- uno::Reference< document::XFilter > xFilter
- ( xComponent, uno::UNO_QUERY );
- if ( xExporter.is() && xFilter.is() )
- {
- SdPage* pPage = NULL;
- sd::DrawViewShell* pDrawViewShell = static_cast< ::sd::DrawViewShell* >
- ( ( ( mrDocShell.GetViewShell() && mrDocShell.GetViewShell()->ISA(::sd::DrawViewShell ) ) ? mrDocShell.GetViewShell() : NULL ) );
+ uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+ uno::Reference< drawing::XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( xContext );
- PageKind ePageKind = PK_STANDARD;
- if( pDrawViewShell )
- {
- ePageKind = pDrawViewShell->GetPageKind();
- if( PK_HANDOUT == ePageKind )
- pPage = mrDocument.GetSdPage( 0, PK_HANDOUT );
- else
- pPage = pDrawViewShell->GetActualPage();
- }
- else
- pPage = mrDocument.GetSdPage( 0, PK_STANDARD );
+ SdPage* pPage = NULL;
+ sd::DrawViewShell* pDrawViewShell = static_cast< ::sd::DrawViewShell* >
+ ( ( ( mrDocShell.GetViewShell() && mrDocShell.GetViewShell()->ISA(::sd::DrawViewShell ) ) ? mrDocShell.GetViewShell() : NULL ) );
+
+ PageKind ePageKind = PK_STANDARD;
+ if( pDrawViewShell )
+ {
+ ePageKind = pDrawViewShell->GetPageKind();
+ if( PK_HANDOUT == ePageKind )
+ pPage = mrDocument.GetSdPage( 0, PK_HANDOUT );
+ else
+ pPage = pDrawViewShell->GetActualPage();
+ }
+ else
+ pPage = mrDocument.GetSdPage( 0, PK_STANDARD );
- if ( pPage )
+ if ( pPage )
+ {
+ // taking the 'correct' page number, seems that there might exist a better method to archive this
+ pPage = mrDocument.GetSdPage( pPage->GetPageNum() ? ( pPage->GetPageNum() - 1 ) >> 1 : 0, ePageKind );
+ if ( pPage )
+ {
+ uno::Reference< lang::XComponent > xSource( pPage->getUnoPage(), uno::UNO_QUERY );
+ SfxItemSet* pSet = mrMedium.GetItemSet();
+ if ( pSet && xSource.is() )
{
- // taking the 'correct' page number, seems that there might exist a better method to archive this
- pPage = mrDocument.GetSdPage( pPage->GetPageNum() ? ( pPage->GetPageNum() - 1 ) >> 1 : 0, ePageKind );
- if ( pPage )
+ const String aTypeName( mrMedium.GetFilter()->GetTypeName() );
+ GraphicFilter &rGraphicFilter = GraphicFilter::GetGraphicFilter();
+ const sal_uInt16 nFilter = rGraphicFilter.GetExportFormatNumberForTypeName( aTypeName );
+ if ( nFilter != GRFILTER_FORMAT_NOTFOUND )
{
- uno::Reference< lang::XComponent > xSource( pPage->getUnoPage(), uno::UNO_QUERY );
- SfxItemSet* pSet = mrMedium.GetItemSet();
- if ( pSet && xSource.is() )
- {
- const String aTypeName( mrMedium.GetFilter()->GetTypeName() );
- GraphicFilter &rGraphicFilter = GraphicFilter::GetGraphicFilter();
- const sal_uInt16 nFilter = rGraphicFilter.GetExportFormatNumberForTypeName( aTypeName );
- if ( nFilter != GRFILTER_FORMAT_NOTFOUND )
- {
- uno::Reference< task::XInteractionHandler > mXInteractionHandler;
+ uno::Reference< task::XInteractionHandler > mXInteractionHandler;
- beans::PropertyValues aArgs;
- TransformItems( SID_SAVEASDOC, *pSet, aArgs );
+ beans::PropertyValues aArgs;
+ TransformItems( SID_SAVEASDOC, *pSet, aArgs );
- rtl::OUString sInteractionHandler( "InteractionHandler" );
- rtl::OUString sFilterName( "FilterName" );
- rtl::OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) );
+ rtl::OUString sInteractionHandler( "InteractionHandler" );
+ rtl::OUString sFilterName( "FilterName" );
+ rtl::OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) );
- sal_Bool bFilterNameFound = sal_False;
- sal_Int32 i, nCount;
- for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ )
- {
- rtl::OUString& rStr = aArgs[ i ].Name;
- if ( rStr == sFilterName )
- {
- bFilterNameFound = sal_True;
- aArgs[ i ].Name = sFilterName;
- aArgs[ i ].Value <<= sShortName;
- }
- else if ( rStr == sInteractionHandler )
- {
- uno::Reference< task::XInteractionHandler > xHdl;
- if ( aArgs[ i ].Value >>= xHdl )
- {
- mXInteractionHandler = new SdGRFFilter_ImplInteractionHdl( xHdl );
- aArgs[ i ].Value <<= mXInteractionHandler;
- }
- }
- }
- if ( !bFilterNameFound )
- {
- aArgs.realloc( ++nCount );
- aArgs[ i ].Name = sFilterName;
- aArgs[ i ].Value <<= sShortName;
- }
-
- // take selection if needed
- if( ( SFX_ITEM_SET == pSet->GetItemState( SID_SELECTION ) )
- && static_cast< const SfxBoolItem& >( pSet->Get( SID_SELECTION ) ).GetValue()
- && pDrawViewShell )
+ sal_Bool bFilterNameFound = sal_False;
+ sal_Int32 i, nCount;
+ for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ )
+ {
+ rtl::OUString& rStr = aArgs[ i ].Name;
+ if ( rStr == sFilterName )
+ {
+ bFilterNameFound = sal_True;
+ aArgs[ i ].Name = sFilterName;
+ aArgs[ i ].Value <<= sShortName;
+ }
+ else if ( rStr == sInteractionHandler )
+ {
+ uno::Reference< task::XInteractionHandler > xHdl;
+ if ( aArgs[ i ].Value >>= xHdl )
{
- uno::Reference< view::XSelectionSupplier > xSelectionSupplier(
- pDrawViewShell->GetViewShellBase().GetController(), uno::UNO_QUERY );
- if ( xSelectionSupplier.is() )
- {
- uno::Any aSelection( xSelectionSupplier->getSelection() );
- uno::Reference< lang::XComponent > xSelection;
- if ( aSelection >>= xSelection )
- xSource = xSelection;
- }
+ mXInteractionHandler = new SdGRFFilter_ImplInteractionHdl( xHdl );
+ aArgs[ i ].Value <<= mXInteractionHandler;
}
- xExporter->setSourceDocument( xSource );
- bRet = xFilter->filter( aArgs );
- if ( !bRet && mXInteractionHandler.is() )
- SdGRFFilter::HandleGraphicFilterError(
- static_cast< SdGRFFilter_ImplInteractionHdl* >( mXInteractionHandler.get() )->GetErrorCode(),
- rGraphicFilter.GetLastError().nStreamError );
}
- }
+ }
+ if ( !bFilterNameFound )
+ {
+ aArgs.realloc( ++nCount );
+ aArgs[ i ].Name = sFilterName;
+ aArgs[ i ].Value <<= sShortName;
+ }
+
+ // take selection if needed
+ if( ( SFX_ITEM_SET == pSet->GetItemState( SID_SELECTION ) )
+ && static_cast< const SfxBoolItem& >( pSet->Get( SID_SELECTION ) ).GetValue()
+ && pDrawViewShell )
+ {
+ uno::Reference< view::XSelectionSupplier > xSelectionSupplier(
+ pDrawViewShell->GetViewShellBase().GetController(), uno::UNO_QUERY );
+ if ( xSelectionSupplier.is() )
+ {
+ uno::Any aSelection( xSelectionSupplier->getSelection() );
+ uno::Reference< lang::XComponent > xSelection;
+ if ( aSelection >>= xSelection )
+ xSource = xSelection;
+ }
+ }
+ xExporter->setSourceDocument( xSource );
+ bRet = xExporter->filter( aArgs );
+ if ( !bRet && mXInteractionHandler.is() )
+ SdGRFFilter::HandleGraphicFilterError(
+ static_cast< SdGRFFilter_ImplInteractionHdl* >( mXInteractionHandler.get() )->GetErrorCode(),
+ rGraphicFilter.GetLastError().nStreamError );
}
- }
+ }
}
}
return bRet;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 10:03:37 +0000