[Libreoffice-commits] core.git: comphelper/source include/comphelper

[Caolán McNamara]

 comphelper/source/misc/mimeconfighelper.cxx |   10 ++++------
 include/comphelper/mimeconfighelper.hxx     |    2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 944d1fd5ca97969bc2cf45376737813c588f6637
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 19 10:21:05 2015 +0000

    fix windows build and sal_Bool->bool
    
    Change-Id: If88a5b1171ef0b586861dd071820bc993c4cf06e

diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 17269a3..361cc00 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -696,23 +696,21 @@ SfxFilterFlags MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterN
     return nFlags;
 }
 
-sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
+bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                         uno::Sequence< beans::PropertyValue >& aMediaDescr )
 {
-    sal_Bool bResult = sal_False;
-
     OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
     if ( !aFilterName.isEmpty() )
     {
         SfxFilterFlags nFlags = GetFilterFlags( aFilterName );
         // check the OWN flag
-        bResult = ( nFlags & SfxFilterFlags::OWN );
+        return bool(nFlags & SfxFilterFlags::OWN);
     }
 
-    return bResult;
+    return false;
 }
-#endif
 
+#endif
 
 OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUString& aServiceName, sal_Int32 nVersion )
 {
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index 5ba0eb9..4791109 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -115,7 +115,7 @@ public:
 #ifdef WNT
     SfxFilterFlags GetFilterFlags( const OUString& aFilterName );
 
-    sal_Bool AddFilterNameCheckOwnFile(
+    bool AddFilterNameCheckOwnFile(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr );
 #endif