diff options
author | Sven Jacobi <sj@openoffice.org> | 2002-07-16 10:42:57 +0000 |
---|---|---|
committer | Sven Jacobi <sj@openoffice.org> | 2002-07-16 10:42:57 +0000 |
commit | 11da82307d43bc042d91f3cdb81f7a685cc5ff48 (patch) | |
tree | 79a507ecf5f8519e7c5b1c0f8e4b33790225e94d /svx/source/unodraw | |
parent | 6cc5470978d8feffad171f37b14a542c23741cea (diff) |
#101108# filterdata is now directly passed to all filters
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 35a9d83abf00..809886dfb26c 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: UnoGraphicExporter.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sj $ $Date: 2002-06-21 14:13:33 $ + * last change: $Author: sj $ $Date: 2002-07-16 11:42:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -410,9 +410,10 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes if( NULL == mpUnoPage ) return sal_False; - GraphicFilter* pFilter = GetGrfFilter(); - SdrPage* pPage = mpUnoPage->GetSdrPage(); - SdrModel* pDoc = pPage->GetModel(); + GraphicFilter* pFilter = GetGrfFilter(); + SdrPage* pPage = mpUnoPage->GetSdrPage(); + SdrModel* pDoc = pPage->GetModel(); + Sequence< PropertyValue > aFilterData; sal_Int32 nWidth = 0; sal_Int32 nHeight = 0; @@ -458,7 +459,10 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes { pValues->Value >>= bExportOnlyBackground; } - + else if ( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) ) + { + pValues->Value >>= aFilterData; + } pValues++; } } @@ -721,7 +725,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes INetURLObject aURLObject( aURL.Complete ); DBG_ASSERT( aURLObject.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - return 0 == XOutBitmap::ExportGraphic( aGraphic, aURLObject, *pFilter, nFilter, FALSE, &aDescriptor ); + return 0 == XOutBitmap::ExportGraphic( aGraphic, aURLObject, *pFilter, nFilter, FALSE, &aFilterData ); } void SAL_CALL GraphicExporter::cancel() |