diff options
Diffstat (limited to 'svtools/source/filter/SvFilterOptionsDialog.cxx')
| -rw-r--r-- | svtools/source/filter/SvFilterOptionsDialog.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 0ce72954b87a..ed2b32c88665 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Sequence.h> @@ -217,10 +218,12 @@ sal_Int16 SvFilterOptionsDialog::execute() OUString aFilterNameStr( "FilterName" ); OUString aInternalFilterName; + uno::Reference<graphic::XGraphic> xGraphic; sal_Int32 j, nCount = maMediaDescriptor.getLength(); for ( j = 0; j < nCount; j++ ) { - if ( maMediaDescriptor[ j ].Name.equals( aFilterNameStr ) ) + const OUString& rName = maMediaDescriptor[ j ].Name; + if ( rName.equals( "FilterName" ) ) { OUString aStr; maMediaDescriptor[ j ].Value >>= aStr; @@ -229,6 +232,10 @@ sal_Int16 SvFilterOptionsDialog::execute() aInternalFilterName = aInternalFilterName.replaceAll( "impress_", "" ); break; } + else if ( rName.equals( "Graphic" ) ) + { + maMediaDescriptor[ j ].Value >>= xGraphic; + } } if ( !aInternalFilterName.isEmpty() ) { @@ -246,7 +253,7 @@ sal_Int16 SvFilterOptionsDialog::execute() aFltCallDlgPara.aFilterData = maFilterDataSequence; aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat ); bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) ); - if ( ScopedVclPtrInstance<ExportDialog>( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat )->Execute() == RET_OK ) + if ( ScopedVclPtrInstance<ExportDialog>( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat, xGraphic )->Execute() == RET_OK ) nRet = ui::dialogs::ExecutableDialogResults::OK; // taking the out parameter from the dialog |