[Libreoffice-commits] core.git: comphelper/source
Noel Grandin
noel at peralex.com
Thu Mar 19 00:57:05 PDT 2015
comphelper/source/misc/mimeconfighelper.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4d2de5816378d119d78e81f60075c88baec8fef2
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 19 09:55:37 2015 +0200
fix windows build
after my commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2
"convert SFX_FILTER_ constants to enum class"
Change-Id: Ieaf524e076f5ecfe16b312a310cd6f5cb8bd637d
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 806fc64..17269a3 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -671,9 +671,9 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
#ifdef WNT
-sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName )
+SfxFilterFlags MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName )
{
- sal_Int32 nFlags = 0;
+ SfxFilterFlags nFlags = SfxFilterFlags::NONE;
try
{
if ( !aFilterName.isEmpty() )
@@ -687,7 +687,7 @@ sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName )
if ( aFilterAny >>= aData )
{
SequenceAsHashMap aFilterHM( aData );
- nFlags = aFilterHM.getUnpackedValueOrDefault( "Flags", (sal_Int32)0 );
+ nFlags = static_cast<SfxFilterFlags>(aFilterHM.getUnpackedValueOrDefault( "Flags", (sal_Int32)0 ));
}
}
} catch( uno::Exception& )
@@ -704,7 +704,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
if ( !aFilterName.isEmpty() )
{
- sal_Int32 nFlags = GetFilterFlags( aFilterName );
+ SfxFilterFlags nFlags = GetFilterFlags( aFilterName );
// check the OWN flag
bResult = ( nFlags & SfxFilterFlags::OWN );
}
More information about the Libreoffice-commits
mailing list