diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 22:55:00 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-19 01:34:04 +0100 |
| commit | e51aca1fa61f2e433da2185e53e9be982f50eb74 (patch) | |
| tree | ede35c5365161ce6012de8c12b2300c10cf7516d /svtools | |
| parent | 4681bacef161d3a44e01b928035d9f30717527ae (diff) | |
svtools: Remove obsolete GraphicFilter::{Do,Has}ImportDialog
And simplify sdgrffilter because this if is always true.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/filter.hxx | 3 | ||||
| -rw-r--r-- | svtools/source/filter/filter.cxx | 30 |
2 files changed, 0 insertions, 33 deletions
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 ) |