summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comphelper/inc/comphelper/mimeconfighelper.hxx4
-rw-r--r--comphelper/source/misc/mimeconfighelper.cxx52
-rwxr-xr-xunusedcode.easy1
3 files changed, 28 insertions, 29 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 )
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 521e03f80608..aadfa5f40b64 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -800,7 +800,6 @@ canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRang
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
comphelper::EventLogger::EventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&)
-comphelper::MimeConfigurationHelper::GetFilterFlags(rtl::OUString const&)
comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
comphelper::OSelectionChangeListener::disposeAdapter()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const