diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-18 22:48:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 12:57:32 +0000 |
| commit | 88cf101f181ed28952699a9086ef259e4b0c2f13 (patch) | |
| tree | 36f344f0c88fa12b963007bedbed49aaba7a46cb /comphelper | |
| parent | 6d12d8cab29ff4d9eb19039a183f90e309fa5d82 (diff) | |
move GetFilterFlags inside ifdef WNT
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/mimeconfighelper.hxx | 4 | ||||
| -rw-r--r-- | comphelper/source/misc/mimeconfighelper.cxx | 52 |
2 files changed, 28 insertions, 28 deletions
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx index 10fcfd1adbdf..217ebb84942e 100644 --- a/comphelper/inc/comphelper/mimeconfighelper.hxx +++ b/comphelper/inc/comphelper/mimeconfighelper.hxx @@ -112,8 +112,6 @@ public: // typedetection related ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory(); - sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName ); - ::rtl::OUString UpdateMediaDescriptorWithFilterName( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, sal_Bool bIgnoreType ); @@ -121,6 +119,8 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject ); #ifdef WNT + sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName ); + sal_Bool AddFilterNameCheckOwnFile( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ); #endif diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index 72ecd73ddb3c..81ef3ba03215 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -201,32 +201,6 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto return m_xFilterFactory; } -//----------------------------------------------------------------------- -sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName ) -{ - sal_Int32 nFlags = 0; - try - { - if ( !aFilterName.isEmpty() ) - { - uno::Reference< container::XNameAccess > xFilterFactory( - GetFilterFactory(), - uno::UNO_SET_THROW ); - - uno::Any aFilterAny = xFilterFactory->getByName( aFilterName ); - uno::Sequence< beans::PropertyValue > aData; - if ( aFilterAny >>= aData ) - { - SequenceAsHashMap aFilterHM( aData ); - nFlags = aFilterHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); - } - } - } catch( uno::Exception& ) - {} - - return nFlags; -} - //------------------------------------------------------------------------- ::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName ) { @@ -706,6 +680,32 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } #ifdef WNT + +sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName ) +{ + sal_Int32 nFlags = 0; + try + { + if ( !aFilterName.isEmpty() ) + { + uno::Reference< container::XNameAccess > xFilterFactory( + GetFilterFactory(), + uno::UNO_SET_THROW ); + + uno::Any aFilterAny = xFilterFactory->getByName( aFilterName ); + uno::Sequence< beans::PropertyValue > aData; + if ( aFilterAny >>= aData ) + { + SequenceAsHashMap aFilterHM( aData ); + nFlags = aFilterHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); + } + } + } catch( uno::Exception& ) + {} + + return nFlags; +} + sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( uno::Sequence< beans::PropertyValue >& aMediaDescr ) { |