summaryrefslogtreecommitdiff
path: root/filter/source/config
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source/config')
-rw-r--r--filter/source/config/cache/basecontainer.cxx8
-rw-r--r--filter/source/config/cache/cacheitem.cxx46
-rw-r--r--filter/source/config/cache/cacheitem.hxx6
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx4
-rw-r--r--filter/source/config/cache/filtercache.cxx52
-rw-r--r--filter/source/config/cache/filtercache.hxx12
-rw-r--r--filter/source/config/cache/filterfactory.cxx8
-rw-r--r--filter/source/config/cache/querytokenizer.cxx8
-rw-r--r--filter/source/config/cache/querytokenizer.hxx4
-rw-r--r--filter/source/config/cache/typedetection.cxx20
-rw-r--r--filter/source/config/cache/typedetection.hxx6
11 files changed, 87 insertions, 87 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index b9c3b802082b..7aaf40aee4b3 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -357,7 +357,7 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames()
sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem)
throw (css::uno::RuntimeException, std::exception)
{
- sal_Bool bHasOne = sal_False;
+ bool bHasOne = false;
impl_loadOnDemand();
@@ -372,7 +372,7 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem)
catch(const css::uno::Exception&)
{
// invalid cache!?
- bHasOne = sal_False;
+ bHasOne = false;
}
// <- SAFE
@@ -395,7 +395,7 @@ css::uno::Type SAL_CALL BaseContainer::getElementType()
sal_Bool SAL_CALL BaseContainer::hasElements()
throw (css::uno::RuntimeException, std::exception)
{
- sal_Bool bHasSome = sal_False;
+ bool bHasSome = false;
impl_loadOnDemand();
@@ -410,7 +410,7 @@ sal_Bool SAL_CALL BaseContainer::hasElements()
catch(const css::uno::Exception&)
{
// invalid cache?!
- bHasSome = sal_False;
+ bHasSome = false;
}
// <- SAFE
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index e82634fb25c2..65945afdc0d6 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -116,7 +116,7 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa
-sal_Bool isSubSet(const css::uno::Any& aSubSet,
+bool isSubSet(const css::uno::Any& aSubSet,
const css::uno::Any& aSet )
{
css::uno::Type aT1 = aSubSet.getValueType();
@@ -125,7 +125,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
if (!aT1.equals(aT2))
{
_FILTER_CONFIG_LOG_("isSubSet() ... types of any values are different => return FALSE\n")
- return sal_False;
+ return false;
}
css::uno::TypeClass aTypeClass = aT1.getTypeClass();
@@ -143,7 +143,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
case css::uno::TypeClass_FLOAT :
case css::uno::TypeClass_DOUBLE :
{
- sal_Bool bIs = (aSubSet == aSet);
+ bool bIs = (aSubSet == aSet);
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for atomic types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -159,7 +159,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= v2)
)
{
- sal_Bool bIs = (v1.equals(v2));
+ bool bIs = (v1.equals(v2));
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for string types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -177,7 +177,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= v2)
)
{
- sal_Bool bIs = (isSubSet(v1, v2));
+ bool bIs = (isSubSet(v1, v2));
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for packed any types => return %s\n", bIs ? "TRUE" : "FALSE")
return bIs;
}
@@ -195,7 +195,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= p2)
)
{
- sal_Bool bIs = (
+ bool bIs = (
(p1.Name.equals(p2.Name) ) &&
(isSubSet(p1.Value, p2.Value))
);
@@ -211,7 +211,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
(aSet >>= n2)
)
{
- sal_Bool bIs = (
+ bool bIs = (
(n1.Name.equals(n2.Name) ) &&
(isSubSet(n1.Value, n2.Value))
);
@@ -242,12 +242,12 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
if (::std::find(stl_s2.begin(), stl_s2.end(), *it1) == stl_s2.end())
{
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... dont found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(*it1))
- return sal_False;
+ return false;
}
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [OUString] ... found \"%s\" => continue loop\n", _FILTER_CONFIG_TO_ASCII_(*it1))
}
_FILTER_CONFIG_LOG_("isSubSet() ... check for list types [OUString] => return TRUE\n")
- return sal_True;
+ return true;
}
css::uno::Sequence< css::beans::PropertyValue > uno_p1;
@@ -269,17 +269,17 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
if (it2 == stl_p2.end())
{
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... dont found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
- return sal_False;
+ return false;
}
if (!isSubSet(it1->second, it2->second))
{
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
- return sal_False;
+ return false;
}
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [PropertyValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
}
_FILTER_CONFIG_LOG_("isSubSet() ... check for list types [PropertyValue] => return TRUE\n")
- return sal_True;
+ return true;
}
css::uno::Sequence< css::beans::NamedValue > uno_n1;
@@ -301,17 +301,17 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
if (it2 == stl_n2.end())
{
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... dont found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
- return sal_False;
+ return false;
}
if (!isSubSet(it1->second, it2->second))
{
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" but has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
- return sal_False;
+ return false;
}
_FILTER_CONFIG_LOG_1_("isSubSet() ... check for list types [NamedValue] ... found \"%s\" with right value => continue loop\n", _FILTER_CONFIG_TO_ASCII_(it1->first))
}
_FILTER_CONFIG_LOG_("isSubSet() ... check for list types [NamedValue] => return TRUE\n")
- return sal_True;
+ return true;
}
}
break;
@@ -319,12 +319,12 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
}
OSL_FAIL("isSubSet() ... this point should not be reached!");
- return sal_False;
+ return false;
}
-sal_Bool CacheItem::haveProps(const CacheItem& lProps) const
+bool CacheItem::haveProps(const CacheItem& lProps) const
{
for (const_iterator pIt = lProps.begin();
pIt != lProps.end() ;
@@ -335,14 +335,14 @@ sal_Bool CacheItem::haveProps(const CacheItem& lProps) const
if (pItThis == this->end())
{
_FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... dont found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
- return sal_False;
+ return false;
}
// ii) one item does not have the right value => return false
if (!isSubSet(pIt->second, pItThis->second))
{
_FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... item \"%s\" has different value => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
- return sal_False;
+ return false;
}
}
@@ -350,12 +350,12 @@ sal_Bool CacheItem::haveProps(const CacheItem& lProps) const
// the given property set seems to match with our
// own properties in its minimum => return TRUE
_FILTER_CONFIG_LOG_("CacheItem::haveProps() ... => return TRUE\n")
- return sal_True;
+ return true;
}
-sal_Bool CacheItem::dontHaveProps(const CacheItem& lProps) const
+bool CacheItem::dontHaveProps(const CacheItem& lProps) const
{
for (const_iterator pIt = lProps.begin();
pIt != lProps.end() ;
@@ -378,7 +378,7 @@ sal_Bool CacheItem::dontHaveProps(const CacheItem& lProps) const
if (isSubSet(pIt->second, pItThis->second))
{
_FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... item \"%s\" has same value => return FALSE!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
- return sal_False;
+ return false;
}
}
@@ -386,7 +386,7 @@ sal_Bool CacheItem::dontHaveProps(const CacheItem& lProps) const
// That means: this item has no matching property
// of the given set. It "dont have" it ... => return true.
_FILTER_CONFIG_LOG_("CacheItem::dontHaveProps() ... => return TRUE\n")
- return sal_True;
+ return true;
}
FlatDetectionInfo::FlatDetectionInfo() :
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index aa37e9f820bf..118057be430b 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -100,7 +100,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
@return sal_True if all given properties exists
at this item; sal_False otherwise.
*/
- sal_Bool haveProps(const CacheItem& lProps) const;
+ bool haveProps(const CacheItem& lProps) const;
@@ -117,7 +117,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
@return sal_False if at least on property exists at this item(!);
sal_True otherwise.
*/
- sal_Bool dontHaveProps(const CacheItem& lProps) const;
+ bool dontHaveProps(const CacheItem& lProps) const;
@@ -134,7 +134,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
@return sal_True if all given properties dont exists
at this item; sal_False otherwise.
*/
- sal_Bool excludeProps(const CacheItem& lProps) const;
+ bool excludeProps(const CacheItem& lProps) const;
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index b00c0f076f20..9bd5fb8720a7 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -148,7 +148,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven
lChangedItems.push_back(sNode);
}
- sal_Bool bNotifyRefresh = sal_False;
+ bool bNotifyRefresh = false;
OUStringList::const_iterator pIt;
for ( pIt = lChangedItems.begin();
pIt != lChangedItems.end() ;
@@ -166,7 +166,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven
// But we know, that the cache is up-to-date know and has thrown this exception afterwards .-)
}
// NO FLUSH! Otherwise we start a never ending story here .-)
- bNotifyRefresh = sal_True;
+ bNotifyRefresh = true;
}
// notify sfx cache about the changed filter cache .-)
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 31c3287fae00..7788d1004a1c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -226,7 +226,7 @@ void FilterCache::load(EFillState eRequired,
-sal_Bool FilterCache::isFillState(FilterCache::EFillState eState) const
+bool FilterCache::isFillState(FilterCache::EFillState eState) const
throw(css::uno::Exception)
{
// SAFE ->
@@ -275,7 +275,7 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType ,
-sal_Bool FilterCache::hasItems(EItemType eType) const
+bool FilterCache::hasItems(EItemType eType) const
throw(css::uno::Exception)
{
// SAFE ->
@@ -316,7 +316,7 @@ OUStringList FilterCache::getItemNames(EItemType eType) const
-sal_Bool FilterCache::hasItem( EItemType eType,
+bool FilterCache::hasItem( EItemType eType,
const OUString& sItem)
throw(css::uno::Exception)
{
@@ -333,18 +333,18 @@ sal_Bool FilterCache::hasItem( EItemType eType,
// loaded into this FilterCache object before.
CacheItemList::const_iterator pIt = rList.find(sItem);
if (pIt != rList.end())
- return sal_True;
+ return true;
try
{
impl_loadItemOnDemand(eType, sItem);
// no exception => item could be loaded!
- return sal_True;
+ return true;
}
catch(const css::container::NoSuchElementException&)
{}
- return sal_False;
+ return false;
// <- SAFE
}
@@ -535,8 +535,8 @@ void FilterCache::addStatePropsToItem( EItemType eType,
xSet->getByName(sItem) >>= xItem;
css::beans::Property aDescription = xItem->getAsProperty();
- sal_Bool bFinalized = ((aDescription.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY );
- sal_Bool bMandatory = ((aDescription.Attributes & css::beans::PropertyAttribute::REMOVABLE) != css::beans::PropertyAttribute::REMOVABLE);
+ bool bFinalized = ((aDescription.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY );
+ bool bMandatory = ((aDescription.Attributes & css::beans::PropertyAttribute::REMOVABLE) != css::beans::PropertyAttribute::REMOVABLE);
rItem[PROPNAME_FINALIZED] <<= bFinalized;
rItem[PROPNAME_MANDATORY] <<= bMandatory;
@@ -838,8 +838,8 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
{
SAL_INFO( "filter.config", "" << sRtlLog.getStr());
*pConfig = impl_createConfigAccess(sPath ,
- sal_False, // bReadOnly
- sal_True ); // bLocalesMode
+ false, // bReadOnly
+ true ); // bLocalesMode
}
@@ -880,8 +880,8 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey)
return css::uno::Any();
css::uno::Reference< css::uno::XInterface > xCfg = impl_createConfigAccess(sRoot ,
- sal_True , // bReadOnly
- sal_False); // bLocalesMode
+ true , // bReadOnly
+ false); // bLocalesMode
if (!xCfg.is())
return css::uno::Any();
@@ -914,8 +914,8 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey)
css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const OUString& sRoot ,
- sal_Bool bReadOnly ,
- sal_Bool bLocalesMode)
+ bool bReadOnly ,
+ bool bLocalesMode)
{
// SAFE ->
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -981,16 +981,16 @@ void FilterCache::impl_validateAndOptimize()
// First check if any filter or type could be readed
// from the underlying configuration!
- sal_Bool bSomeTypesShouldExist = ((m_eFillState & E_CONTAINS_STANDARD ) == E_CONTAINS_STANDARD );
- sal_Bool bAllFiltersShouldExist = ((m_eFillState & E_CONTAINS_FILTERS ) == E_CONTAINS_FILTERS );
+ bool bSomeTypesShouldExist = ((m_eFillState & E_CONTAINS_STANDARD ) == E_CONTAINS_STANDARD );
+ bool bAllFiltersShouldExist = ((m_eFillState & E_CONTAINS_FILTERS ) == E_CONTAINS_FILTERS );
#if OSL_DEBUG_LEVEL > 0
sal_Int32 nWarnings = 0;
// sal_Bool bAllTypesShouldExist = ((m_eFillState & E_CONTAINS_TYPES ) == E_CONTAINS_TYPES );
- sal_Bool bAllLoadersShouldExist = ((m_eFillState & E_CONTAINS_FRAMELOADERS ) == E_CONTAINS_FRAMELOADERS );
- sal_Bool bAllHandlersShouldExist = ((m_eFillState & E_CONTAINS_CONTENTHANDLERS) == E_CONTAINS_CONTENTHANDLERS);
+ bool bAllLoadersShouldExist = ((m_eFillState & E_CONTAINS_FRAMELOADERS ) == E_CONTAINS_FRAMELOADERS );
+ bool bAllHandlersShouldExist = ((m_eFillState & E_CONTAINS_CONTENTHANDLERS) == E_CONTAINS_CONTENTHANDLERS);
#endif
if (
@@ -1069,7 +1069,7 @@ void FilterCache::impl_validateAndOptimize()
// (they shouldn't - but they can!) ... Ignore it. The last
// preferred type is useable in the same manner then every
// other type!
- sal_Bool bPreferred = sal_False;
+ bool bPreferred = false;
aType[PROPNAME_PREFERRED] >>= bPreferred;
const OUString* pExtensions = lExtensions.getConstArray();
@@ -1119,8 +1119,8 @@ void FilterCache::impl_validateAndOptimize()
// May be it can be handled by a ContentHandler ...
// But at this time its not guaranteed that there is any ContentHandler
// or FrameLoader inside this cache ... but on disk ...
- sal_Bool bReferencedByLoader = sal_True;
- sal_Bool bReferencedByHandler = sal_True;
+ bool bReferencedByLoader = true;
+ bool bReferencedByHandler = true;
if (bAllLoadersShouldExist)
bReferencedByLoader = !impl_searchFrameLoaderForType(sType).isEmpty();
@@ -1296,8 +1296,8 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::
const OUString& sItem)
throw(css::uno::Exception)
{
- sal_Bool bExistsInConfigLayer = xSet->hasByName(sItem);
- sal_Bool bExistsInMemory = (rList.find(sItem) != rList.end());
+ bool bExistsInConfigLayer = xSet->hasByName(sItem);
+ bool bExistsInMemory = (rList.find(sItem) != rList.end());
EItemFlushState eState( E_ITEM_UNCHANGED );
@@ -1821,7 +1821,7 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType
xRoot->getByName(sSet) >>= xSet;
CacheItemList::iterator pItemInCache = pList->find(sItem);
- sal_Bool bItemInConfig = xSet->hasByName(sItem);
+ bool bItemInConfig = xSet->hasByName(sItem);
if (bItemInConfig)
{
@@ -2360,7 +2360,7 @@ OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) co
-sal_Bool FilterCache::impl_isModuleInstalled(const OUString& sModule)
+bool FilterCache::impl_isModuleInstalled(const OUString& sModule)
{
css::uno::Reference< css::container::XNameAccess > xCfg;
@@ -2378,7 +2378,7 @@ sal_Bool FilterCache::impl_isModuleInstalled(const OUString& sModule)
if (xCfg.is())
return xCfg->hasByName(sModule);
- return sal_False;
+ return false;
}
} // namespace config
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index c8c0d41ce2ca..05cbfe2dd69e 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -362,7 +362,7 @@ class FilterCache : public BaseLock
@return sal_True if the required fill state exists for this cache; FALSE
otherwise.
*/
- virtual sal_Bool isFillState(EFillState eRequired) const
+ virtual bool isFillState(EFillState eRequired) const
throw(css::uno::Exception);
@@ -426,7 +426,7 @@ class FilterCache : public BaseLock
if some input parameter are wrong or the cache itself is not valid
any longer, because any operation before damage it.
*/
- virtual sal_Bool hasItems(EItemType eType) const
+ virtual bool hasItems(EItemType eType) const
throw(css::uno::Exception);
@@ -475,7 +475,7 @@ class FilterCache : public BaseLock
if some input parameter are wrong or the cache itself is not valid
any longer, because any operation before damage it.
*/
- virtual sal_Bool hasItem( EItemType eType,
+ virtual bool hasItem( EItemType eType,
const OUString& sItem)
throw(css::uno::Exception);
@@ -696,8 +696,8 @@ class FilterCache : public BaseLock
a NULL reference otherwise.
*/
css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const OUString& sRoot ,
- sal_Bool bReadOnly ,
- sal_Bool bLocalesMode);
+ bool bReadOnly ,
+ bool bLocalesMode);
@@ -1011,7 +1011,7 @@ class FilterCache : public BaseLock
@return sal_True if the requested module is installed; sal_False otherwise.
*/
- sal_Bool impl_isModuleInstalled(const OUString& sModule);
+ bool impl_isModuleInstalled(const OUString& sModule);
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index ee9ef4bdc517..9e68b6e0bc38 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -380,12 +380,12 @@ class stlcomp_removeIfMatchFlags
private:
FilterCache* m_pCache ;
sal_Int32 m_nFlags ;
- sal_Bool m_bIFlags;
+ bool m_bIFlags;
public:
stlcomp_removeIfMatchFlags(FilterCache* pCache ,
sal_Int32 nFlags ,
- sal_Bool bIFlags)
+ bool bIFlags)
: m_pCache (pCache )
, m_nFlags (nFlags )
, m_bIFlags(bIFlags)
@@ -521,12 +521,12 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sM
// remove all filters from this merged list, which does not fit the flag specification
if (nIFlags != -1)
{
- pItToErase = ::std::remove_if(lMergedFilters.begin(), lMergedFilters.end(), stlcomp_removeIfMatchFlags(pCache, nIFlags, sal_True));
+ pItToErase = ::std::remove_if(lMergedFilters.begin(), lMergedFilters.end(), stlcomp_removeIfMatchFlags(pCache, nIFlags, true));
lMergedFilters.erase(pItToErase, lMergedFilters.end());
}
if (nEFlags != -1)
{
- pItToErase = ::std::remove_if(lMergedFilters.begin(), lMergedFilters.end(), stlcomp_removeIfMatchFlags(pCache, nEFlags, sal_False));
+ pItToErase = ::std::remove_if(lMergedFilters.begin(), lMergedFilters.end(), stlcomp_removeIfMatchFlags(pCache, nEFlags, false));
lMergedFilters.erase(pItToErase, lMergedFilters.end());
}
diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx
index 8a28f1e2cf60..aca41854d898 100644
--- a/filter/source/config/cache/querytokenizer.cxx
+++ b/filter/source/config/cache/querytokenizer.cxx
@@ -28,7 +28,7 @@ namespace filter{
QueryTokenizer::QueryTokenizer(const OUString& sQuery)
- : m_bValid(sal_True)
+ : m_bValid(true)
{
sal_Int32 token = 0;
while(token != -1)
@@ -39,7 +39,7 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery)
sal_Int32 equal = sToken.indexOf('=');
if (equal == 0)
- m_bValid = sal_False;
+ m_bValid = false;
OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nFound non boolean query parameter ... but its key is empty. Will be ignored!\n");
OUString sKey;
@@ -53,7 +53,7 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery)
}
if (find(sKey) != end())
- m_bValid = sal_False;
+ m_bValid = false;
OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nQuery contains same param more then once. Last one wins :-)\n");
(*this)[sKey] = sVal;
@@ -70,7 +70,7 @@ QueryTokenizer::~QueryTokenizer()
-sal_Bool QueryTokenizer::valid() const
+bool QueryTokenizer::valid() const
{
return m_bValid;
}
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index 8cc11ff24156..914700cc62e3 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -61,7 +61,7 @@ class QueryTokenizer : public ::boost::unordered_map< OUString
TODO May it's a good idea to describe the real problem
more detailed ...
*/
- sal_Bool m_bValid;
+ bool m_bValid;
// interface
@@ -91,7 +91,7 @@ class QueryTokenizer : public ::boost::unordered_map< OUString
/** @short can be used to check if analyzing of given query
was successfully or not.
*/
- virtual sal_Bool valid() const;
+ virtual bool valid() const;
};
} // namespace config
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 470e3a5faaec..76db2bc48c07 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -873,7 +873,7 @@ void TypeDetection::impl_getAllFormatTypes(
OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& rDescriptor ,
const FlatDetection& lFlatTypes ,
- sal_Bool bAllowDeep ,
+ bool bAllowDeep ,
OUStringList& rUsedDetectors,
OUString& rLastChance )
{
@@ -1060,7 +1060,7 @@ OUString TypeDetection::impl_askDetectService(const OUString& sDet
// this special helper checks for a valid type
// and set right values on the descriptor!
- sal_Bool bValidType = impl_validateAndSetTypeOnDescriptor(rDescriptor, sDeepType);
+ bool bValidType = impl_validateAndSetTypeOnDescriptor(rDescriptor, sDeepType);
if (bValidType)
return sDeepType;
@@ -1133,9 +1133,9 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor)
throw (css::uno::Exception)
{
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
OUString sURL = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
- sal_Bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_READONLY(), sal_False );
+ bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_READONLY(), sal_False );
if ( !sURL.isEmpty() && ::utl::LocalFileHelper::IsLocalFile( INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE ) ) )
{
// OOo uses own file locking mechanics in case of local file
@@ -1173,7 +1173,7 @@ void TypeDetection::impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rD
-sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor,
+bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor,
const OUString& sType )
{
// SAFE ->
@@ -1181,19 +1181,19 @@ sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDesc
if (m_rCache->hasItem(FilterCache::E_TYPE, sType))
{
rDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
- return sal_True;
+ return true;
}
aLock.clear();
// <- SAFE
// remove all related information from the descriptor
impl_removeTypeFilterFromDescriptor(rDescriptor);
- return sal_False;
+ return false;
}
-sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor,
+bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor,
const OUString& sFilter )
{
try
@@ -1212,13 +1212,13 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDe
// found valid type and filter => set it on the given descriptor
rDescriptor[utl::MediaDescriptor::PROP_TYPENAME() ] <<= sType ;
rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
- return sal_True;
+ return true;
}
catch(const css::container::NoSuchElementException&){}
// remove all related information from the descriptor
impl_removeTypeFilterFromDescriptor(rDescriptor);
- return sal_False;
+ return false;
}
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 2dc2eec45cfb..e21a9c281970 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -128,7 +128,7 @@ private:
*/
OUString impl_detectTypeFlatAndDeep( utl::MediaDescriptor& rDescriptor ,
const FlatDetection& lFlatTypes ,
- sal_Bool bAllowDeep ,
+ bool bAllowDeep ,
OUStringList& rUsedDetectors,
OUString& rLastChance );
@@ -243,7 +243,7 @@ private:
@return TRUE the specified type and its registrations was valid(!) and
could be set on the descriptor.
*/
- sal_Bool impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor,
+ bool impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor,
const OUString& sType );
@@ -265,7 +265,7 @@ private:
@return TRUE the specified type and its registrations was valid(!) and
could be set on the descriptor.
*/
- sal_Bool impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor,
+ bool impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor,
const OUString& sFilter );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 12:42:13 +0000