diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-24 01:24:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-24 11:21:42 +0100 |
commit | cb97526259e265e488a50c2747407f7289f8839c (patch) | |
tree | 9878e79d50804e941141fbc8391b47829faf323f /svtools | |
parent | 7e4ed3e5b8b9209240b9608aa0037a6a6732ef1c (diff) |
callcatcher: remove various unused methods
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/FilterConfigItem.hxx | 3 | ||||
-rw-r--r-- | svtools/source/filter/FilterConfigCache.cxx | 10 | ||||
-rw-r--r-- | svtools/source/filter/FilterConfigCache.hxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/FilterConfigItem.cxx | 95 | ||||
-rw-r--r-- | svtools/source/filter/filter.cxx | 1 |
5 files changed, 0 insertions, 111 deletions
diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx index 06988af9704b..d2c45867844d 100644 --- a/svtools/inc/svtools/FilterConfigItem.hxx +++ b/svtools/inc/svtools/FilterConfigItem.hxx @@ -76,8 +76,6 @@ class SVT_DLLPUBLIC FilterConfigItem // 3. given default sal_Bool ReadBool( const ::rtl::OUString& rKey, sal_Bool bDefault ); sal_Int32 ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault ); - ::com::sun::star::awt::Size - ReadSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rDefault ); ::rtl::OUString ReadString( const ::rtl::OUString& rKey, const ::rtl::OUString& rDefault ); ::com::sun::star::uno::Any @@ -87,7 +85,6 @@ class SVT_DLLPUBLIC FilterConfigItem // and always stores into the FilterData sequence void WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue ); void WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue ); - void WriteSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rSize ); void WriteString( const ::rtl::OUString& rKey, const ::rtl::OUString& rString ); void WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny ); diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx index 3ea92f72635b..32674cc9850c 100644 --- a/svtools/source/filter/FilterConfigCache.cxx +++ b/svtools/source/filter/FilterConfigCache.cxx @@ -67,11 +67,6 @@ const char* FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameLi "epp", "ira", "era", "itg", "iti", "eti", "exp", NULL }; -sal_Bool FilterConfigCache::FilterConfigCacheEntry::IsValid() -{ - return sFilterName.Len() != 0; -} - sal_Bool FilterConfigCache::bInitialized = sal_False; sal_Int32 FilterConfigCache::nIndType = -1; sal_Int32 FilterConfigCache::nIndUIName = -1; @@ -466,11 +461,6 @@ sal_Bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } -sal_Bool FilterConfigCache::IsImportDialog( sal_uInt16 nFormat ) -{ - return (nFormat < aImport.size()) && aImport[ nFormat ].bHasDialog; -} - // ------------------------------------------------------------------------ String FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) diff --git a/svtools/source/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx index b1579bec092a..a944a6d0253e 100644 --- a/svtools/source/filter/FilterConfigCache.hxx +++ b/svtools/source/filter/FilterConfigCache.hxx @@ -66,7 +66,6 @@ class SVT_DLLPUBLIC FilterConfigCache sal_Bool bIsInternalFilter : 1; sal_Bool bIsPixelFormat : 1; - sal_Bool IsValid(); sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry ); String GetShortName( ); @@ -116,7 +115,6 @@ class SVT_DLLPUBLIC FilterConfigCache sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); - sal_Bool IsImportDialog( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx index fddeec1f0482..10428c6a2456 100644 --- a/svtools/source/filter/FilterConfigItem.cxx +++ b/svtools/source/filter/FilterConfigItem.cxx @@ -333,51 +333,6 @@ sal_Int32 FilterConfigItem::ReadInt32( const OUString& rKey, sal_Int32 nDefault return nRetValue; } - -Size FilterConfigItem::ReadSize( const OUString& rKey, const Size& rDefault ) -{ - Any aAny; - Size aRetValue( rDefault ); - - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ); - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ); - - Reference< XPropertySet > aXPropSet; - try - { - PropertyValue* pPropWidth = GetPropertyValue( aFilterData, sWidth ); - PropertyValue* pPropHeight= GetPropertyValue( aFilterData, sHeight ); - if ( pPropWidth && pPropHeight ) - { - pPropWidth->Value >>= aRetValue.Width; - pPropHeight->Value >>= aRetValue.Height; - } - else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) - { - if ( aAny >>= aXPropSet ) - { - if ( ImplGetPropertyValue( aAny, aXPropSet, sWidth, sal_True ) ) - aAny >>= aRetValue.Width; - if ( ImplGetPropertyValue( aAny, aXPropSet, sHeight, sal_True ) ) - aAny >>= aRetValue.Height; - } - } - } - catch ( ::com::sun::star::uno::Exception& ) - { - OSL_FAIL( "FilterConfigItem::ReadSize - could not read PropertyValue" ); - } - PropertyValue aWidth; - aWidth.Name = sWidth; - aWidth.Value <<= aRetValue.Width; - WritePropertyValue( aFilterData, aWidth ); - PropertyValue aHeight; - aHeight.Name = sHeight; - aHeight.Value <<= aRetValue.Height; - WritePropertyValue( aFilterData, aHeight ); - return aRetValue; -} - OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDefault ) { Any aAny; @@ -484,56 +439,6 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } -void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue ) -{ - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ); - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ); - - PropertyValue aWidth; - aWidth.Name = sWidth; - aWidth.Value <<= rNewValue.Width; - WritePropertyValue( aFilterData, aWidth ); - - PropertyValue aHeight; - aHeight.Name = sHeight; - aHeight.Value <<= rNewValue.Height; - WritePropertyValue( aFilterData, aHeight ); - - if ( xPropSet.is() ) - { - Any aAny; - sal_Int32 nOldWidth = rNewValue.Width; - sal_Int32 nOldHeight = rNewValue.Height; - - if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) - { - try - { - Reference< XPropertySet > aXPropSet; - if ( aAny >>= aXPropSet ) - { - if ( ImplGetPropertyValue( aAny, aXPropSet, sWidth, sal_True ) ) - aAny >>= nOldWidth; - if ( ImplGetPropertyValue( aAny, aXPropSet, sHeight, sal_True ) ) - aAny >>= nOldHeight; - } - if ( ( nOldWidth != rNewValue.Width ) || ( nOldHeight != rNewValue.Height ) ) - { - aAny <<= rNewValue.Width; - aXPropSet->setPropertyValue( sWidth, aAny ); - aAny <<= rNewValue.Height; - aXPropSet->setPropertyValue( sHeight, aAny ); - bModified = sal_True; - } - } - catch ( ::com::sun::star::uno::Exception& ) - { - OSL_FAIL( "FilterConfigItem::WriteSize - could not read PropertyValue" ); - } - } - } -} - void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewValue ) { PropertyValue aString; diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index c39e1e478af8..72fc266b7df6 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -2086,7 +2086,6 @@ sal_Bool GraphicFilter::Setup( sal_uInt16 ) sal_Bool GraphicFilter::HasImportDialog( sal_uInt16 ) { return sal_True; -// return pConfig->IsImportDialog( nFormat ); } // ------------------------------------------------------------------------ |