diff options
| -rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 4 | ||||
| -rw-r--r-- | svtools/inc/svtools/filter.hxx | 3 | ||||
| -rw-r--r-- | svtools/source/filter/filter.cxx | 30 |
3 files changed, 0 insertions, 37 deletions
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 48d46ab11ab1..4f50f37171e0 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -210,9 +210,6 @@ sal_Bool SdGRFFilter::Import() const sal_uInt16 nFilter = rGraphicFilter.GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); sal_Bool bRet = sal_False; - // ggf. Filterdialog ausfuehren - if ( !rGraphicFilter.HasImportDialog( nFilter ) || rGraphicFilter.DoImportDialog( NULL, nFilter ) ) - { SvStream* pIStm = mrMedium.GetInStream(); sal_uInt16 nReturn = pIStm ? rGraphicFilter.ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; @@ -259,7 +256,6 @@ sal_Bool SdGRFFilter::Import() pPage->InsertObject( new SdrGrafObj( aGraphic, Rectangle( aPos, aGrfSize ) ) ); bRet = sal_True; } - } return bRet; } diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index ce530b5d5ac6..526ef933753d 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -316,9 +316,6 @@ public: String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); - sal_Bool HasImportDialog( sal_uInt16 nFormat ); - sal_Bool DoImportDialog( Window* pWindow, sal_uInt16 nFormat ); - sal_Bool HasExportDialog( sal_uInt16 nFormat ); sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat ); sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat, FieldUnit eFieldUnit ); diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index ee1f3292b1fc..dce88f41558a 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> @@ -77,8 +76,6 @@ #define IMPORT_FUNCTION_NAME "GraphicImport" #define EXPORT_FUNCTION_NAME "GraphicExport" -#define IMPDLG_FUNCTION_NAME "DoImportDialog" -#define EXPDLG_FUNCTION_NAME "DoExportDialog" // ----------- // - statics - @@ -926,9 +923,6 @@ struct ImpFilterLibCacheEntry int operator==( const String& rFiltername ) const { return maFiltername == rFiltername; } PFilterCall GetImportFunction(); - PFilterDlgCall GetImportDlgFunction(); - PFilterCall GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); } - PFilterDlgCall GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); } }; // ------------------------------------------------------------------------ @@ -954,14 +948,6 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() // ------------------------------------------------------------------------ -PFilterDlgCall ImpFilterLibCacheEntry::GetImportDlgFunction() -{ - if( !mpfnImportDlg ) - mpfnImportDlg = (PFilterDlgCall)maLibrary.getFunctionSymbol( UniString::CreateFromAscii( IMPDLG_FUNCTION_NAME ) ); - - return mpfnImportDlg; -} - // --------------------- // - ImpFilterLibCache - // --------------------- @@ -2094,22 +2080,6 @@ sal_Bool GraphicFilter::Setup( sal_uInt16 ) return sal_False; } -/* ------------------------------------------------------------------------ - No Import filter has a dialog, so - the following two methods are obsolete */ - -sal_Bool GraphicFilter::HasImportDialog( sal_uInt16 ) -{ - return sal_True; -} - -// ------------------------------------------------------------------------ - -sal_Bool GraphicFilter::DoImportDialog( Window*, sal_uInt16 ) -{ - return sal_True; -} - // ------------------------------------------------------------------------ sal_Bool GraphicFilter::HasExportDialog( sal_uInt16 nFormat ) |