filter: sal_Bool->bool
Change-Id: Icf20f23cb46ad3cb147d8c6a743f1d25a23fbca5
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index b9c3b80..7aaf40a 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 e82634f..65945af 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 aa37e9f..118057b 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 b00c0f0..9bd5fb8 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 31c3287..7788d10 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 c8c0d41..05cbfe2 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 ee9ef4b..9e68b6e 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 8a28f1e..aca4185 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 8cc11ff..914700c 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 470e3a5..76db2bc 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 2dc2eec..e21a9c2 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 );
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 9c719df..083b158 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -69,8 +69,8 @@ PageInfo::PageInfo()
, mnBackgroundID( 0 )
, mnObjectsID( 0)
, mnForegroundID( 0)
, mbBackgroundVisible( sal_False )
, mbBackgroundObjectsVisible( sal_False )
, mbBackgroundVisible( false )
, mbBackgroundObjectsVisible( false )
{
}
@@ -95,7 +95,7 @@ FlashExporter::FlashExporter(
const Reference< XDrawPage >& rxSelectedDrawPage,
sal_Int32 nJPEGCompressMode,
sal_Bool bExportOLEAsJPEG)
bool bExportOLEAsJPEG)
: mxContext(rxContext)
// #i56084# variables for selection export
, mxSelectedShapes(rxSelectedShapes)
@@ -139,7 +139,7 @@ const sal_uInt16 cBackgroundObjectsDepth = 3;
const sal_uInt16 cPageObjectsDepth = 4;
const sal_uInt16 cWaitButtonDepth = 10;
sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOutputStream > &xOutputStream, Reference< XStatusIndicator> &xStatusIndicator )
bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOutputStream > &xOutputStream, Reference< XStatusIndicator> &xStatusIndicator )
{
Reference< XServiceInfo > xDocServInfo( xDoc, UNO_QUERY );
if( xDocServInfo.is() )
@@ -147,11 +147,11 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY);
if(!xDrawPagesSupplier.is())
return sal_False;
return false;
Reference< XIndexAccess > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY );
if(!xDrawPages.is())
return sal_False;
return false;
Reference< XDrawPage > xDrawPage;
@@ -212,7 +212,7 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
if( mbPresentation )
{
sal_Bool bVisible = sal_False;
bool bVisible = false;
xPropSet->getPropertyValue( "Visible" ) >>= bVisible;
if( !bVisible )
continue;
@@ -278,15 +278,15 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
mpWriter->storeTo( xOutputStream );
return sal_True;
return true;
}
sal_Bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 /* nPage */ )
bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 /* nPage */ )
{
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
if( !xDrawPage.is() || !xPropSet.is() )
return sal_False;
return false;
try
{
@@ -300,10 +300,10 @@ sal_Bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Referenc
if( mbPresentation )
{
sal_Bool bVisible = sal_False;
bool bVisible = false;
xPropSet->getPropertyValue( "Visible" ) >>= bVisible;
if( !bVisible )
return sal_False;
return false;
}
}
catch( const Exception& )
@@ -315,10 +315,10 @@ sal_Bool FlashExporter::exportSlides( Reference< XDrawPage > xDrawPage, Referenc
mpWriter->storeTo( xOutputStream );
return sal_True;
return true;
}
sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 nPage, sal_Bool bExportObjects )
sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, Reference< XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects )
{
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
if( !xDrawPage.is() || !xPropSet.is() )
@@ -347,14 +347,14 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, R
return nPage;
}
sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, sal_uInt16 nPage, sal_Bool bExportObjects )
sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects )
{
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
if( !xDrawPage.is() || !xPropSet.is() )
return sal_False;
sal_Bool bBackgroundVisible = true;
sal_Bool bBackgroundObjectsVisible = true;
bool bBackgroundVisible = true;
bool bBackgroundObjectsVisible = true;
if( mbPresentation )
{
@@ -564,7 +564,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster
try
{
// skip empty presentation objects
sal_Bool bEmpty = sal_False;
bool bEmpty = false;
xPropSet->getPropertyValue( "IsEmptyPresentationObject" ) >>= bEmpty;
if( bEmpty )
return;
@@ -677,7 +677,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
if(bExportAsJPEG)
{
aFilterData[2].Name = "Translucent";
aFilterData[2].Value <<= (sal_Bool)sal_True;
aFilterData[2].Value <<= true;
}
Sequence< PropertyValue > aDescriptor( bOnlyBackground ? 4 : 3 );
@@ -695,7 +695,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
if( bOnlyBackground )
{
aDescriptor[3].Name = "ExportOnlyBackground";
aDescriptor[3].Value <<= (sal_Bool)bOnlyBackground;
aDescriptor[3].Value <<= bOnlyBackground;
}
mxGraphicExporter->setSourceDocument( xComponent );
mxGraphicExporter->filter( aDescriptor );
diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx
index cb2a280..589fd08 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -75,11 +75,11 @@ public:
OUString maBookmark;
sal_Int32 mnDimColor;
sal_Bool mbDimHide;
sal_Bool mbDimPrev;
bool mbDimHide;
bool mbDimPrev;
sal_Bool mbSoundOn;
sal_Bool mbPlayFull;
bool mbSoundOn;
bool mbPlayFull;
OUString maSoundURL;
sal_Int32 mnBlueScreenColor;
@@ -127,8 +127,8 @@ struct PageInfo
sal_uInt16 mnObjectsID;
sal_uInt16 mnForegroundID;
sal_Bool mbBackgroundVisible;
sal_Bool mbBackgroundObjectsVisible;
bool mbBackgroundVisible;
bool mbBackgroundObjectsVisible;
ShapeInfoVector maShapesVector;
@@ -154,15 +154,15 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxSelectedDrawPage,
sal_Int32 nJPEGCompressMode = -1,
sal_Bool bExportOLEAsJPEG = false);
bool bExportOLEAsJPEG = false);
~FlashExporter();
void Flush();
sal_Bool exportAll( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> &xStatusIndicator );
sal_Bool exportSlides( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage);
sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, sal_Bool bExportObjects );
sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, sal_Bool bExportObjects );
bool exportAll( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> &xStatusIndicator );
bool exportSlides( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage);
sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects );
sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects );
ChecksumCache gMasterCache;
ChecksumCache gPrivateCache;
@@ -203,9 +203,9 @@ private:
sal_Int32 mnJPEGcompressMode;
sal_Bool mbExportOLEAsJPEG;
bool mbExportOLEAsJPEG;
sal_Bool mbPresentation;
bool mbPresentation;
sal_Int32 mnPageNumber;
};
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 986a403..bbbf0f1 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -164,8 +164,8 @@ public:
// XFilter
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
sal_Bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
@@ -316,21 +316,21 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const ::com::sun::star::uno::Sequen
// AS: HACK! Right now, I create a directory as a sibling to the swf file selected in the Export
// dialog. This directory is called presentation.sxi-swf-files. The name of the swf file selected
// in the Export dialog has no impact on this. All files created are placed in this directory.
sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& aDescriptor)
bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& aDescriptor)
{
Reference< XDrawPagesSupplier > xDrawPagesSupplier(mxDoc, UNO_QUERY);
if(!xDrawPagesSupplier.is())
return sal_False;
return false;
Reference< XIndexAccess > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY );
if(!xDrawPages.is())
return sal_False;
return false;
Reference< XDesktop2 > rDesktop = Desktop::create( mxContext );
Reference< XStorable > xStorable(rDesktop->getCurrentComponent(), UNO_QUERY);
if (!xStorable.is())
return sal_False;
return false;
Reference< XDrawPage > xDrawPage;
@@ -377,7 +377,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
// AS: Only export the background config if we're exporting all of the pages, otherwise we'll
// screw it up.
sal_Bool bExportAll = findPropertyValue<sal_Bool>(aFilterData, "ExportAll", true);
bool bExportAll = findPropertyValue<sal_Bool>(aFilterData, "ExportAll", true);
if (bExportAll)
{
osl_removeFile(fullpath.pData);
@@ -427,7 +427,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
fullpath = swfdirpath + STR("/slide") + VAL(nPage+1) + STR("p.swf");
Reference<XOutputStream> xOutputStreamWrap(*(new OslOutputStreamWrapper(fullpath)), UNO_QUERY);
sal_Bool ret = aFlashExporter.exportSlides( xDrawPage, xOutputStreamWrap, sal::static_int_cast<sal_uInt16>( nPage ) );
bool ret = aFlashExporter.exportSlides( xDrawPage, xOutputStreamWrap, sal::static_int_cast<sal_uInt16>( nPage ) );
aFlashExporter.Flush();
xOutputStreamWrap.clear();
@@ -453,10 +453,10 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
if (bExportAll)
osl_closeFile(xBackgroundConfig);
return sal_True;
return true;
}
sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDescriptor)
bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDescriptor)
{
Reference < XOutputStream > xOutputStream = findPropertyValue<Reference<XOutputStream> >(aDescriptor, "OutputStream", 0);
Sequence< PropertyValue > aFilterData;
@@ -464,7 +464,7 @@ sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >&
if (!xOutputStream.is() )
{
OSL_ASSERT ( false );
return sal_False;
return false;
}
FlashExporter aFlashExporter(
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 507de6f..9ce5f78 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -316,7 +316,7 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16
CharacterIdVector::iterator aIter( maShapeIds.begin() );
const CharacterIdVector::iterator aEnd( maShapeIds.end() );
sal_Bool bHaveShapes = aIter != aEnd;
bool bHaveShapes = aIter != aEnd;
if (bHaveShapes)
{
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index c65388f..2d0a4aa 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -339,10 +339,10 @@ private:
void Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pCompressed, sal_uInt32 compressed_size );
void Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon);
void Impl_writeActions( const GDIMetaFile& rMtf );
void Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled );
void Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor );
void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence = 0);
void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor );
void Impl_writePolygon( const Polygon& rPoly, bool bFilled );
void Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor );
void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence = 0);
void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor );
void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth );
void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor );
void Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
@@ -354,9 +354,9 @@ private:
FlashFont& Impl_getFont( const Font& rFont );
static void Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool bFilled );
static void Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, bool bFilled );
static void Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, sal_Bool bFilled );
static void Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, bool bFilled );
static void Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int16 dy );
static void Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, sal_Int16 control_dy, sal_Int16 anchor_dx, sal_Int16 anchor_dy );
static void Impl_addEndShapeRecord( BitStream& rBits );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index c8bc2e8..40d787c 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -120,7 +120,7 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
/**
*/
void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool bFilled )
void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, bool bFilled )
{
Point aLastPoint( rPoly[0] );
@@ -177,13 +177,13 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
/** exports a style change record with a move to (x,y) and depending on bFilled a line style 1 or fill style 1
*/
void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, sal_Bool bFilled )
void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, bool bFilled )
{
rBits.writeUB( 0, 1 ); // TypeFlag
rBits.writeUB( 0, 1 ); // StateNewStyles
rBits.writeUB( sal_uInt32(!bFilled), 1 ); // StateLineStyle
rBits.writeUB( 0, 1 ); // StateFillStyle0
rBits.writeUB( bFilled, 1 ); // StateFillStyle1
rBits.writeUB( bFilled ? 0 : 1, 1 ); // StateFillStyle1
rBits.writeUB( 1, 1 ); // StateMoveTo
sal_uInt16 nMoveBits = max( getMaxBitsSigned( dx ), getMaxBitsSigned( dy ) );
@@ -264,7 +264,7 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits )
void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled )
{
PolyPolygon aPolyPoly( rPoly );
Impl_writePolyPolygon( aPolyPoly, bFilled );
@@ -272,7 +272,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
void Writer::Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor )
{
PolyPolygon aPolyPoly( rPoly );
Impl_writePolyPolygon( aPolyPoly, bFilled, rFillColor, rLineColor );
@@ -280,7 +280,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Co
void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence /* = 0 */ )
void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence /* = 0 */ )
{
Color aLineColor( mpVDev->GetLineColor() );
if( 0 == aLineColor.GetTransparency() )
@@ -293,7 +293,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFill
void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor )
{
PolyPolygon aPolyPoly( rPolyPoly );
@@ -523,7 +523,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
PolyPolygon aPolyPoygon;
mpVDev->GetTextOutline( aPolyPoygon, rText, 0, 0, (sal_uInt16)nLen, true, nWidth, pDXArray );
aPolyPoygon.Translate( rPos );
Impl_writePolyPolygon( aPolyPoygon, sal_True, aTextColor, aTextColor );
Impl_writePolyPolygon( aPolyPoygon, true, aTextColor, aTextColor );
}
else
{
@@ -698,7 +698,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
aPoly[ 3 ].X() = aPoly[ 0 ].X();
aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
Impl_writePolygon( aPoly, sal_True, aTextColor, aTextColor );
Impl_writePolygon( aPoly, true, aTextColor, aTextColor );
}
// AS: The factor of 1.5 on the nLineHeight is a magic number. I'm not sure why it works,
@@ -714,7 +714,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
aPoly[ 3 ].X() = aPoly[ 0 ].X();
aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
Impl_writePolygon( aPoly, sal_True, aTextColor, aTextColor );
Impl_writePolygon( aPoly, true, aTextColor, aTextColor );
}
}
@@ -1355,7 +1355,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf
for(sal_uInt32 a(0); a < aLinePolyPolygon.count(); a++)
{
const basegfx::B2DPolygon aCandidate(aLinePolyPolygon.getB2DPolygon(a));
Impl_writePolygon(Polygon(aCandidate), sal_False );
Impl_writePolygon(Polygon(aCandidate), false );
}
}
@@ -1370,7 +1370,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf
for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++)
{
const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a));
Impl_writePolyPolygon(PolyPolygon(Polygon(aPolygon)), sal_True );
Impl_writePolyPolygon(PolyPolygon(Polygon(aPolygon)), true );
}
mpVDev->SetLineColor(aOldLineColor);
@@ -1487,7 +1487,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( aPoly.GetSize() )
{
Impl_writePolygon( aPoly, sal_True );
Impl_writePolygon( aPoly, true );
}
}
break;
@@ -1501,7 +1501,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
if(pA->GetLineInfo().IsDefault())
{
Impl_writePolygon( rPoly, sal_False );
Impl_writePolygon( rPoly, false );
}
else
{
@@ -1518,7 +1518,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
const PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
if( rPolyPoly.Count() )
Impl_writePolyPolygon( rPolyPoly, sal_True );
Impl_writePolyPolygon( rPolyPoly, true );
}
break;
@@ -1557,7 +1557,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
// convert transparence from percent into 0x00 - 0xff
sal_uInt8 nTransparence = (sal_uInt8) MinMax( FRound( pA->GetTransparence() * 2.55 ), 0, 255 );
Impl_writePolyPolygon( rPolyPoly, sal_True, nTransparence );
Impl_writePolyPolygon( rPolyPoly, true, nTransparence );
}
}
break;
@@ -1604,7 +1604,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
const MetaEPSAction* pA = (const MetaEPSAction*) pAction;
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
sal_Bool bFound = sal_False;
bool bFound = false;
for( size_t j = 0, nC = aGDIMetaFile.GetActionSize(); ( j < nC ) && !bFound; j++ )
{
@@ -1612,7 +1612,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
{
bFound = sal_True;
bFound = true;
const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*) pSubstAct;
Impl_writeImage( pBmpScaleAction->GetBitmap(),
pA->GetPoint(), pA->GetSize(),
@@ -1630,7 +1630,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pA->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN") )
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
bool bDone = false;
while( !bDone && ( ++i < nCount ) )
{
@@ -1641,7 +1641,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
{
bDone = sal_True;
bDone = true;
}
}
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 536008c..4a897c8 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -42,11 +42,11 @@ class GIFWriter
long nActX;
long nActY;
sal_Int32 nInterlaced;
sal_Bool bStatus;
sal_Bool bTransparent;
bool bStatus;
bool bTransparent;
void MayCallback( sal_uLong nPercent );
void WriteSignature( sal_Bool bGIF89a );
void WriteSignature( bool bGIF89a );
void WriteGlobalHeader( const Size& rSize );
void WriteLoopExtension( const Animation& rAnimation );
void WriteLogSizeExtension( const Size& rSize100 );
@@ -56,11 +56,11 @@ class GIFWriter
void WriteAccess();
void WriteTerminator();
sal_Bool CreateAccess( const BitmapEx& rBmpEx );
bool CreateAccess( const BitmapEx& rBmpEx );
void DestroyAccess();
void WriteAnimation( const Animation& rAnimation );
void WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, sal_Bool bExtended,
void WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, bool bExtended,
long nTimer = 0, Disposal eDisposal = DISPOSE_NOT );
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
@@ -70,7 +70,7 @@ public:
GIFWriter(SvStream &rStream);
~GIFWriter() {}
sal_Bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem );
bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem );
};
GIFWriter::GIFWriter(SvStream &rStream)
@@ -89,7 +89,7 @@ GIFWriter::GIFWriter(SvStream &rStream)
sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
if ( pFilterConfigItem )
{
@@ -103,12 +103,12 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC
Size aSize100;
const MapMode aMap( rGraphic.GetPrefMapMode() );
sal_Bool bLogSize = ( aMap.GetMapUnit() != MAP_PIXEL );
bool bLogSize = ( aMap.GetMapUnit() != MAP_PIXEL );
if( bLogSize )
aSize100 = Application::GetDefaultDevice()->LogicToLogic( rGraphic.GetPrefSize(), aMap, MAP_100TH_MM );
bStatus = sal_True;
bStatus = true;
nLastPercent = 0;
nInterlaced = 0;
m_pAcc = NULL;
@@ -122,7 +122,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC
{
const Animation& rAnimation = rGraphic.GetAnimation();
WriteSignature( sal_True );
WriteSignature( true );
if ( bStatus )
{
@@ -139,7 +139,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC
}
else
{
const sal_Bool bGrafTrans = rGraphic.IsTransparent();
const bool bGrafTrans = rGraphic.IsTransparent();
BitmapEx aBmpEx;
@@ -179,7 +179,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC
void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint,
sal_Bool bExtended, long nTimer, Disposal eDisposal )
bool bExtended, long nTimer, Disposal eDisposal )
{
if( CreateAccess( rBmpEx ) )
{
@@ -223,7 +223,7 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation )
{
const AnimationBitmap& rAnimBmp = rAnimation.Get( i );
WriteBitmapEx( rAnimBmp.aBmpEx, rAnimBmp.aPosPix, sal_True,
WriteBitmapEx( rAnimBmp.aBmpEx, rAnimBmp.aPosPix, true,
rAnimBmp.nWait, rAnimBmp.eDisposal );
nMinPercent = nMaxPercent;
nMaxPercent = (sal_uLong) ( nMaxPercent + fStep );
@@ -248,14 +248,14 @@ void GIFWriter::MayCallback( sal_uLong nPercent )
sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
{
if( bStatus )
{
Bitmap aMask( rBmpEx.GetMask() );
aAccBmp = rBmpEx.GetBitmap();
bTransparent = sal_False;
bTransparent = false;
if( !!aMask )
{
@@ -263,7 +263,7 @@ sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
{
aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
aAccBmp.Replace( aMask, BMP_COL_TRANS );
bTransparent = sal_True;
bTransparent = true;
}
else
aAccBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
@@ -274,7 +274,7 @@ sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
m_pAcc = aAccBmp.AcquireReadAccess();
if( !m_pAcc )
bStatus = sal_False;
bStatus = false;
}
return bStatus;
@@ -290,14 +290,14 @@ void GIFWriter::DestroyAccess()
void GIFWriter::WriteSignature( sal_Bool bGIF89a )
void GIFWriter::WriteSignature( bool bGIF89a )
{
if( bStatus )
{
m_rGIF.Write( bGIF89a ? "GIF89a" : "GIF87a" , 6 );
if( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -327,7 +327,7 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize )
m_rGIF.WriteUInt16( (sal_uInt16) 65535 );
if( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -411,7 +411,7 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
m_rGIF.WriteUChar( (sal_uInt8) 0x00 );
if( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -443,7 +443,7 @@ void GIFWriter::WriteLocalHeader()
m_rGIF.WriteUChar( cFlags );
if( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -470,7 +470,7 @@ void GIFWriter::WritePalette()
m_rGIF.SeekRel( ( nMaxCount - nCount ) * 3 );
if( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -483,7 +483,7 @@ void GIFWriter::WriteAccess()
const long nHeight = m_pAcc->Height();
boost::scoped_array<sal_uInt8> pBuffer;
const sal_uLong nFormat = m_pAcc->GetScanlineFormat();
sal_Bool bNative = ( BMP_FORMAT_8BIT_PAL == nFormat );
bool bNative = ( BMP_FORMAT_8BIT_PAL == nFormat );
if( !bNative )
pBuffer.reset(new sal_uInt8[ nWidth ]);
@@ -532,7 +532,7 @@ void GIFWriter::WriteAccess()
}
if ( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * i / nHeight );
@@ -543,7 +543,7 @@ void GIFWriter::WriteAccess()
aCompressor.EndCompression();
if ( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -556,7 +556,7 @@ void GIFWriter::WriteTerminator()
m_rGIF.WriteUChar( (sal_uInt8) 0x3b );
if( m_rGIF.GetError() )
bStatus = sal_False;
bStatus = false;
}
}
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 0f47228..54654c6 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -124,7 +124,7 @@ class METWriter
{
private:
sal_Bool bStatus;
bool bStatus;
sal_uInt32 nLastPercent; // with which number pCallback has been called the last time
SvStream* pMET;
Rectangle aPictureRect;
@@ -198,7 +198,7 @@ private:
void METSetAndPushLineInfo( const LineInfo& rLineInfo );
void METPopLineInfo( const LineInfo& rLineInfo );
void METBitBlt(Point aPt, Size aSize, const Size& rSizePixel);
void METBeginArea(sal_Bool bBoundaryLine);
void METBeginArea(bool bBoundaryLine);
void METEndArea();
void METBeginPath(sal_uInt32 nPathId);
void METEndPath();
@@ -210,7 +210,7 @@ private:
void METLine(const Polygon & rPolygon);
void METLine(const PolyPolygon & rPolyPolygon);
void METLineAtCurPos(Point aPt);
void METBox(sal_Bool bFill, sal_Bool bBoundary,
void METBox(bool bFill, bool bBoundary,
Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis);
void METFullArc(Point aCenter, double fMultiplier);
void METPartialArcAtCurPos(Point aCenter, double fMultiplier,
@@ -237,7 +237,7 @@ private:
public:
METWriter()
: bStatus(sal_False)
: bStatus(false)
, nLastPercent( 0 )
, pMET(NULL)
, nActualFieldStartPos( 0 )
@@ -266,7 +266,7 @@ public:
}
}
sal_Bool WriteMET( const GDIMetaFile & rMTF, SvStream & rTargetStream,
bool WriteMET( const GDIMetaFile & rMTF, SvStream & rTargetStream,
FilterConfigItem* pConfigItem );
};
@@ -400,7 +400,7 @@ void METWriter::CreateChrSets(const GDIMetaFile * pMTF)
size_t nAction, nActionCount;
const MetaAction * pMA;
if (bStatus==sal_False)
if (bStatus==false)
return;
nActionCount = pMTF->GetActionSize();
@@ -512,7 +512,7 @@ void METWriter::WriteColorAttributeTable(sal_uInt32 nFieldId, BitmapPalette* pPa
{
sal_uInt16 nIndex,nNumI,i;
if (bStatus==sal_False) return;
if (bStatus==false) return;
//--- The Field 'Begin Color Attribute Table':
WriteFieldIntroducer(16,BegColAtrMagic,0,0);
@@ -557,7 +557,7 @@ void METWriter::WriteColorAttributeTable(sal_uInt32 nFieldId, BitmapPalette* pPa
WriteFieldId(nFieldId);
if (pMET->GetError())
bStatus=sal_False;
bStatus=false;
}
@@ -570,7 +570,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
sal_uInt16 nBitsPerPixel;
sal_uInt8 nbyte;
if (bStatus==sal_False)
if (bStatus==false)
return;
nActColMapId=((nActBitmapId>>24)&0x000000ff) | ((nActBitmapId>> 8)&0x0000ff00) |
@@ -701,10 +701,10 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
pMET->Write(pBuf.get(),nBytesPerLine);
ny++;
}
if (aTemp.GetError() || pMET->GetError()) bStatus=sal_False;
if (aTemp.GetError() || pMET->GetError()) bStatus=false;
nActBitmapPercent=(ny+1)*100/nHeight;
MayCallback();
if (bStatus==sal_False) return;
if (bStatus==false) return;
}
pBuf.reset();
@@ -728,7 +728,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
nWrittenBitmaps++;
nActBitmapPercent=0;
if (pMET->GetError()) bStatus=sal_False;
if (pMET->GetError()) bStatus=false;
}
@@ -736,7 +736,7 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
{
const MetaAction* pMA;
if (bStatus==sal_False)
if (bStatus==false)
return;
for ( size_t nAction = 0, nActionCount = pMTF->GetActionSize(); nAction < nActionCount; nAction++)
@@ -808,17 +808,17 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
break;
}
if (bStatus==sal_False)
if (bStatus==false)
break;
}
if (pMET->GetError())
bStatus=sal_False;
bStatus=false;
}
void METWriter::WriteDataDescriptor(const GDIMetaFile *)
{
if (bStatus==sal_False)
if (bStatus==false)
return;
WriteFieldIntroducer(0,DscGrfObjMagic,0,0);
@@ -1128,7 +1128,7 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
UpdateFieldSize();
if (pMET->GetError()) bStatus=sal_False;
if (pMET->GetError()) bStatus=false;
}
@@ -1221,7 +1221,7 @@ void METWriter::METPopLineInfo( const LineInfo& rLineInfo )
}
}
void METWriter::METBeginArea(sal_Bool bBoundaryLine)
void METWriter::METBeginArea(bool bBoundaryLine)
{
WillWriteOrder(2);
pMET->WriteUChar( (sal_uInt8)0x68 );
@@ -1293,17 +1293,17 @@ void METWriter::METLine(Point aPt1, Point aPt2)
void METWriter::METLine(const Polygon & rPolygon)
{
sal_uInt16 nNumPoints,i,j,nOrderPoints;
sal_Bool bFirstOrder;
bool bFirstOrder;
bFirstOrder=sal_True;
bFirstOrder=true;
i=0; nNumPoints=rPolygon.GetSize();
while (i<nNumPoints) {
nOrderPoints=nNumPoints-i;
if (nOrderPoints>30) nOrderPoints=30;
WillWriteOrder(nOrderPoints*8+2);
if (bFirstOrder==sal_True) {
if (bFirstOrder) {
pMET->WriteUChar( (sal_uInt8)0xc1 ); // Line at given pos
bFirstOrder=sal_False;
bFirstOrder=false;
}
else {
pMET->WriteUChar( (sal_uInt8)0x81 ); // Line at current pos
@@ -1333,7 +1333,7 @@ void METWriter::METLineAtCurPos(Point aPt)
}
void METWriter::METBox(sal_Bool bFill, sal_Bool bBoundary,
void METWriter::METBox(bool bFill, bool bBoundary,
Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis)
{
sal_uInt8 nFlags=0;
@@ -1491,7 +1491,7 @@ void METWriter::METSetChrSet(sal_uInt8 nSet)
void METWriter::WriteOrders( const GDIMetaFile* pMTF )
{
if(bStatus==sal_False)
if(bStatus==false)
return;
for( size_t nA = 0, nACount = pMTF->GetActionSize(); nA < nACount; nA++ )
@@ -1516,7 +1516,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
METSetArcParams(1,1,0,0);
METSetMix(eGDIRasterOp);
METSetColor(aGDILineColor);
METBeginArea(sal_False);
METBeginArea(false);
METFullArc(pA->GetPoint(),0.5);
METEndArea();
}
@@ -1554,14 +1554,14 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
METSetMix( eGDIRasterOp );
METSetColor( aGDIFillColor );
METSetBackgroundColor( aGDIFillColor );
METBox( sal_True, sal_False, pA->GetRect(), 0, 0 );
METBox( true, false, pA->GetRect(), 0, 0 );
}
if( aGDILineColor != Color( COL_TRANSPARENT ) )
{
METSetMix( eGDIRasterOp );
METSetColor( aGDILineColor );
METBox( sal_False, sal_True, pA->GetRect(), 0, 0 );
METBox( false, true, pA->GetRect(), 0, 0 );
}
}
break;
@@ -1575,14 +1575,14 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
METSetMix( eGDIRasterOp );
METSetColor( aGDIFillColor );
METSetBackgroundColor( aGDIFillColor );
METBox( sal_True, sal_False, pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
METBox( true, false, pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
}
if( aGDILineColor != Color( COL_TRANSPARENT ) )
{
METSetMix( eGDIRasterOp );
METSetColor( aGDILineColor );
METBox( sal_False, sal_True, pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
METBox( false, true, pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
}
}
break;
@@ -1602,7 +1602,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
METSetMix( eGDIRasterOp );
METSetColor( aGDIFillColor );
METSetBackgroundColor( aGDIFillColor );
METBeginArea(sal_False);
METBeginArea(false);
METFullArc(aCenter,0.5);
METEndArea();
}
@@ -2330,9 +2330,9 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
MayCallback();
if( pMET->GetError() )
bStatus=sal_False;
bStatus=false;
if( bStatus == sal_False )
if( bStatus == false )
break;
}
}
@@ -2388,7 +2388,7 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF)
{
sal_uInt32 nSegmentSize,nPos,nDataFieldsStartPos;
if( bStatus==sal_False )
if( bStatus==false )
return;
//--- Das Feld 'Begin Graphics Object':
@@ -2442,13 +2442,13 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF)
WriteFieldId(7);
if( pMET->GetError() )
bStatus=sal_False;
bStatus=false;
}
void METWriter::WriteResourceGroup(const GDIMetaFile * pMTF)
{
if( bStatus==sal_False )
if( bStatus==false )
return;
//--- The Field 'Begin Resource Group':
@@ -2467,13 +2467,13 @@ void METWriter::WriteResourceGroup(const GDIMetaFile * pMTF)
WriteFieldId(2);
if( pMET->GetError() )
bStatus=sal_False;
bStatus=false;
}
void METWriter::WriteDocument(const GDIMetaFile * pMTF)
{
if( bStatus==sal_False )
if( bStatus==false )
return;
//--- The Field 'Begin Document':
@@ -2493,10 +2493,10 @@ void METWriter::WriteDocument(const GDIMetaFile * pMTF)
WriteFieldId(1);
if( pMET->GetError() )
bStatus=sal_False;
bStatus=false;
}
sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
{
if ( pFilterConfigItem )
{
@@ -2511,7 +2511,7 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream,
METChrSet* pCS;
METGDIStackMember* pGS;
bStatus=sal_True;
bStatus=true;
nLastPercent=0;
pMET=&rTargetStream;
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index c4de732..f0b575e 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -35,12 +35,12 @@ private:
SvStream& m_rOStm; // the output PBM file
sal_uInt16 mpOStmOldModus;
sal_Bool mbStatus;
bool mbStatus;
sal_Int32 mnMode; // 0 -> raw, 1-> ascii
BitmapReadAccess* mpAcc;
sal_uLong mnWidth, mnHeight; // size in pixel
sal_Bool ImplWriteHeader();
bool ImplWriteHeader();
void ImplWriteBody();
void ImplWriteNumber( sal_Int32 );
@@ -50,7 +50,7 @@ public:
PBMWriter(SvStream &rPBM);
~PBMWriter();
sal_Bool WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
bool WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
//=================== Methods of PBMWriter ==============================
@@ -58,7 +58,7 @@ public:
PBMWriter::PBMWriter(SvStream &rPBM)
: m_rOStm(rPBM)
, mpOStmOldModus(0)
, mbStatus(sal_True)
, mbStatus(true)
, mnMode(0)
, mpAcc(NULL)
, mnWidth(0)
@@ -74,7 +74,7 @@ PBMWriter::~PBMWriter()
sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
if ( pFilterConfigItem )
{
@@ -104,7 +104,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilter
aBmp.ReleaseAccess( mpAcc );
}
else
mbStatus = sal_False;
mbStatus = false;
m_rOStm.SetNumberFormatInt( mpOStmOldModus );
@@ -116,7 +116,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilter
sal_Bool PBMWriter::ImplWriteHeader()
bool PBMWriter::ImplWriteHeader()
{
mnWidth = mpAcc->Width();
mnHeight = mpAcc->Height();
@@ -132,7 +132,7 @@ sal_Bool PBMWriter::ImplWriteHeader()
ImplWriteNumber( mnHeight );
m_rOStm.WriteUChar( (sal_uInt8)10 );
}
else mbStatus = sal_False;
else mbStatus = false;
return mbStatus;
}
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 65c4145..af81bae 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -35,12 +35,12 @@ private:
SvStream& m_rOStm; // the output PGM file
sal_uInt16 mpOStmOldModus;
sal_Bool mbStatus;
bool mbStatus;
sal_uInt32 mnMode;
BitmapReadAccess* mpAcc;
sal_uLong mnWidth, mnHeight; // image size in pixeln
sal_Bool ImplWriteHeader();
bool ImplWriteHeader();
void ImplWriteBody();
void ImplWriteNumber( sal_Int32 );
@@ -50,13 +50,13 @@ public:
PGMWriter(SvStream &rStream);
~PGMWriter();
sal_Bool WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
bool WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
//=================== Methoden von PGMWriter ==============================
PGMWriter::PGMWriter(SvStream &rStream)
: m_rOStm(rStream)
, mbStatus(sal_True)
, mbStatus(true)
, mnMode(0)
, mpAcc(NULL)
, mnWidth(0)
@@ -70,7 +70,7 @@ PGMWriter::~PGMWriter()
sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
if ( pFilterConfigItem )
{
@@ -101,7 +101,7 @@ sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilter
aBmp.ReleaseAccess( mpAcc );
}
else
mbStatus = sal_False;
mbStatus = false;
m_rOStm.SetNumberFormatInt( mpOStmOldModus );
@@ -113,7 +113,7 @@ sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilter
sal_Bool PGMWriter::ImplWriteHeader()
bool PGMWriter::ImplWriteHeader()
{
mnWidth = mpAcc->Width();
mnHeight = mpAcc->Height();
@@ -132,7 +132,7 @@ sal_Bool PGMWriter::ImplWriteHeader()
m_rOStm.WriteUChar( (sal_uInt8)10 );
}
else
mbStatus = sal_False;
mbStatus = false;
return mbStatus;
}
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 22b90fd..1675cdc 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -64,7 +64,7 @@ class PictWriter {
private:
sal_Bool bStatus;
bool bStatus;
sal_uLong nLastPercent; // with which number pCallback has been called the last time
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
@@ -81,19 +81,19 @@ private:
PictWriterAttrStackMember * pAttrStack;
// current attributes in the target-metafile and whether they are valid
sal_Bool bDstBkPatValid;
sal_uInt8 nDstTxFace; sal_Bool bDstTxFaceValid;
RasterOp eDstTxMode; sal_Bool bDstTxModeValid;
sal_uInt16 nDstPnSize; sal_Bool bDstPnSizeValid;
RasterOp eDstPnMode; sal_Bool bDstPnModeValid;
PictPattern aDstPnPat; sal_Bool bDstPnPatValid;
sal_Bool bDstFillPatValid;
sal_uInt16 nDstTxSize; sal_Bool bDstTxSizeValid;
Color aDstFgCol; sal_Bool bDstFgColValid;
Color aDstBkCol; sal_Bool bDstBkColValid;
Point aDstPenPosition; sal_Bool bDstPenPositionValid;
Point aDstTextPosition; sal_Bool bDstTextPositionValid;
OUString aDstFontName; sal_uInt16 nDstFontNameId; sal_Bool bDstFontNameValid;
bool bDstBkPatValid;
sal_uInt8 nDstTxFace; bool bDstTxFaceValid;
RasterOp eDstTxMode; bool bDstTxModeValid;
sal_uInt16 nDstPnSize; bool bDstPnSizeValid;
RasterOp eDstPnMode; bool bDstPnModeValid;
PictPattern aDstPnPat; bool bDstPnPatValid;
bool bDstFillPatValid;
sal_uInt16 nDstTxSize; bool bDstTxSizeValid;
Color aDstFgCol; bool bDstFgColValid;
Color aDstBkCol; bool bDstBkColValid;
Point aDstPenPosition; bool bDstPenPositionValid;
Point aDstTextPosition; bool bDstTextPositionValid;
OUString aDstFontName; sal_uInt16 nDstFontNameId; bool bDstFontNameValid;
sal_uLong nNumberOfActions; // number of actions in the GDIMetafile
sal_uLong nNumberOfBitmaps; // number of bitmaps
@@ -122,22 +122,22 @@ private:
void WritePolygon(const Polygon & rPoly);
void WriteArcAngles(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
void ConvertLinePattern(PictPattern & rPat, sal_Bool bVisible) const;
void ConvertFillPattern(PictPattern & rPat, sal_Bool bVisible) const;
void ConvertLinePattern(PictPattern & rPat, bool bVisible) const;
void ConvertFillPattern(PictPattern & rPat, bool bVisible) const;
void WriteOpcode_TxFace(const Font & rFont);
void WriteOpcode_TxMode(RasterOp eMode);
void WriteOpcode_PnSize(sal_uInt16 nSize);
void WriteOpcode_PnMode(RasterOp eMode);
void WriteOpcode_PnLinePat(sal_Bool bVisible);
void WriteOpcode_PnFillPat(sal_Bool bVisible);
void WriteOpcode_PnLinePat(bool bVisible);
void WriteOpcode_PnFillPat(bool bVisible);
void WriteOpcode_OvSize(const Size & rSize);
void WriteOpcode_TxSize(sal_uInt16 nSize);
void WriteOpcode_RGBFgCol(const Color & rColor);
void WriteOpcode_RGBBkCol(const Color & rColor);
void WriteOpcode_Line(const Point & rLocPt, const Point & rNewPt);
void WriteOpcode_LineFrom(const Point & rNewPt);
void WriteOpcode_Text(const Point & rPoint, const OUString& rString, sal_Bool bDelta);
void WriteOpcode_Text(const Point & rPoint, const OUString& rString, bool bDelta);
void WriteOpcode_FontName(const Font & rFont);
void WriteOpcode_ClipRect( const Rectangle& rRect );
void WriteOpcode_Rect(PictDrawingMethod eMethod, const Rectangle & rRect);
@@ -168,7 +168,7 @@ private:
public:
sal_Bool WritePict( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pFilterConfigItem );
bool WritePict( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pFilterConfigItem );
};
@@ -416,7 +416,7 @@ void PictWriter::WriteArcAngles(const Rectangle & rRect, const Point & rStartPt,
}
void PictWriter::ConvertLinePattern(PictPattern & rPat, sal_Bool bVisible) const
void PictWriter::ConvertLinePattern(PictPattern & rPat, bool bVisible) const
{
if( bVisible )
{
@@ -430,7 +430,7 @@ void PictWriter::ConvertLinePattern(PictPattern & rPat, sal_Bool bVisible) const
}
}
void PictWriter::ConvertFillPattern(PictPattern & rPat, sal_Bool bVisible) const
void PictWriter::ConvertFillPattern(PictPattern & rPat, bool bVisible) const
{
if( bVisible )
{
@@ -461,10 +461,10 @@ void PictWriter::WriteOpcode_TxFace(const Font & rFont)
if (rFont.IsOutline()) nFace|=0x08;
if (rFont.IsShadow()) nFace|=0x10;
if (bDstTxFaceValid==sal_False || nDstTxFace!=nFace) {
if (bDstTxFaceValid==false || nDstTxFace!=nFace) {
pPict->WriteUInt16( (sal_uInt16)0x0004 ).WriteUChar( nFace ).WriteUChar( (sal_uInt8)0 );
nDstTxFace=nFace;
bDstTxFaceValid=sal_True;
bDstTxFaceValid=true;
}
}
@@ -473,7 +473,7 @@ void PictWriter::WriteOpcode_TxMode(RasterOp eMode)
{
sal_uInt16 nVal;
if (bDstTxModeValid==sal_False || eDstTxMode!=eMode) {
if (bDstTxModeValid==false || eDstTxMode!=eMode) {
switch (eMode) {
case ROP_INVERT: nVal=0x000c; break;
case ROP_XOR: nVal=0x000a; break;
@@ -481,7 +481,7 @@ void PictWriter::WriteOpcode_TxMode(RasterOp eMode)
}
pPict->WriteUInt16( (sal_uInt16)0x0005 ).WriteUInt16( nVal );
eDstTxMode=eMode;
bDstTxModeValid=sal_True;
bDstTxModeValid=true;
}
}
@@ -489,10 +489,10 @@ void PictWriter::WriteOpcode_TxMode(RasterOp eMode)
void PictWriter::WriteOpcode_PnSize(sal_uInt16 nSize)
{
if (nSize==0) nSize=1;
if (bDstPnSizeValid==sal_False || nDstPnSize!=nSize) {
if (bDstPnSizeValid==false || nDstPnSize!=nSize) {
pPict->WriteUInt16( (sal_uInt16)0x0007 ).WriteUInt16( nSize ).WriteUInt16( nSize );
nDstPnSize=nSize;
bDstPnSizeValid=sal_True;
bDstPnSizeValid=true;
}
}
@@ -501,7 +501,7 @@ void PictWriter::WriteOpcode_PnMode(RasterOp eMode)
{
sal_uInt16 nVal;
if (bDstPnModeValid==sal_False || eDstPnMode!=eMode) {
if (bDstPnModeValid==false || eDstPnMode!=eMode) {
switch (eMode)
{
case ROP_INVERT: nVal=0x000c; break;
@@ -510,33 +510,33 @@ void PictWriter::WriteOpcode_PnMode(RasterOp eMode)
}
pPict->WriteUInt16( (sal_uInt16)0x0008 ).WriteUInt16( nVal );
eDstPnMode=eMode;
bDstPnModeValid=sal_True;
bDstPnModeValid=true;
}
}
void PictWriter::WriteOpcode_PnLinePat(sal_Bool bVisible)
void PictWriter::WriteOpcode_PnLinePat(bool bVisible)
{
PictPattern aPat;
ConvertLinePattern(aPat,bVisible);
if (bDstPnPatValid==sal_False || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) {
if (bDstPnPatValid==false || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) {
pPict->WriteUInt16( (sal_uInt16)0x0009 ).WriteUInt32( aPat.nHi ).WriteUInt32( aPat.nLo );
aDstPnPat=aPat;
bDstPnPatValid=sal_True;
bDstPnPatValid=true;
}
}
void PictWriter::WriteOpcode_PnFillPat(sal_Bool bVisible)
void PictWriter::WriteOpcode_PnFillPat(bool bVisible)
{
PictPattern aPat;
ConvertFillPattern(aPat,bVisible);
if (bDstPnPatValid==sal_False || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) {
if (bDstPnPatValid==false || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) {
pPict->WriteUInt16( (sal_uInt16)0x0009 ).WriteUInt32( aPat.nHi ).WriteUInt32( aPat.nLo );
aDstPnPat=aPat;
bDstPnPatValid=sal_True;
bDstPnPatValid=true;
}
}
@@ -550,35 +550,35 @@ void PictWriter::WriteOpcode_OvSize(const Size & rSize)
void PictWriter::WriteOpcode_TxSize(sal_uInt16 nSize)
{
if (bDstTxSizeValid==sal_False || nDstTxSize!=nSize) {
if (bDstTxSizeValid==false || nDstTxSize!=nSize) {
nDstTxSize = (sal_uInt16) OutputDevice::LogicToLogic( Size( 0, nSize ),
aSrcMapMode, aTargetMapMode ).Height();
pPict->WriteUInt16( (sal_uInt16)0x000d ).WriteUInt16( nDstTxSize );
bDstTxSizeValid=sal_True;
bDstTxSizeValid=true;
}
}
void PictWriter::WriteOpcode_RGBFgCol(const Color & rColor)
{
if (bDstFgColValid==sal_False || aDstFgCol!=rColor) {
if (bDstFgColValid==false || aDstFgCol!=rColor) {
pPict->WriteUInt16( (sal_uInt16)0x001a );
WriteRGBColor(rColor);
aDstFgCol=rColor;
bDstFgColValid=sal_True;
bDstFgColValid=true;
}
}
void PictWriter::WriteOpcode_RGBBkCol(const Color & rColor)
{
if (bDstBkColValid==sal_False || aDstBkCol!=rColor) {
if (bDstBkColValid==false || aDstBkCol!=rColor) {
pPict->WriteUInt16( (sal_uInt16)0x001b );
WriteRGBColor(rColor);
aDstBkCol=rColor;
bDstBkColValid=sal_True;
bDstBkColValid=true;
}
}
@@ -608,7 +608,7 @@ void PictWriter::WriteOpcode_Line(const Point & rLocPt, const Point & rNewPt)
WritePoint(rNewPt);
}
aDstPenPosition=rNewPt;
bDstPenPositionValid=sal_True;
bDstPenPositionValid=true;
}
@@ -633,11 +633,11 @@ void PictWriter::WriteOpcode_LineFrom(const Point & rNewPt)
WritePoint(rNewPt);
}
aDstPenPosition=rNewPt;
bDstPenPositionValid=sal_True;
bDstPenPositionValid=true;
}
void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString, sal_Bool bDelta)
void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString, bool bDelta)
{
Point aPoint = OutputDevice::LogicToLogic( rPoint,
aSrcMapMode,
@@ -649,7 +649,7 @@ void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString,
dh = aPoint.X()-aDstTextPosition.X();
dv = aPoint.Y()-aDstTextPosition.Y();
if (bDstTextPositionValid==sal_False || dh<0 || dh>255 || dv<0 || dv>255 || bDelta==sal_False)
if (bDstTextPositionValid==false || dh<0 || dh>255 || dv<0 || dv>255 || bDelta==false)
{
pPict->WriteUInt16( (sal_uInt16)0x0028 );
WritePoint(rPoint);
@@ -672,7 +672,7 @@ void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString,
pPict->WriteUChar( (sal_uInt8)0 );
aDstTextPosition = aPoint;
bDstTextPositionValid=sal_True;
bDstTextPositionValid=true;
}
@@ -687,7 +687,7 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont)
default: nFontId=1;
}
if (bDstFontNameValid==sal_False || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName())
if (bDstFontNameValid==false || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName())
{
OString aString(OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding()));
sal_uInt16 nFontNameLen = aString.getLength();
@@ -702,7 +702,7 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont)
pPict->WriteUInt16( (sal_uInt16)0x0003 ).WriteUInt16( nFontId );
aDstFontName=rFont.GetName();
nDstFontNameId=nFontId;
bDstFontNameValid=sal_True;
bDstFontNameValid=true;
}
}
@@ -882,7 +882,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
nActBitmapPercent=30;
MayCallback();
if ( bStatus == sal_False )
if ( bStatus == false )
return;
if ( ( pAcc = aBitmap.AcquireReadAccess() ) == NULL )
return;
@@ -1255,7 +1255,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
nActBitmapPercent =( ny * 70 / nHeight ) + 30; // (30% already added up to the writing of the Win-BMP file)
MayCallback();
if ( pPict->GetError() )
bStatus = sal_False;
bStatus = false;
}
}
@@ -1298,7 +1298,7 @@ void PictWriter::SetAttrForText()
{
WriteOpcode_RGBFgCol(aSrcFont.GetColor());
WriteOpcode_RGBBkCol(aSrcFont.GetFillColor());
WriteOpcode_PnLinePat(sal_True);
WriteOpcode_PnLinePat(true);
WriteOpcode_FontName(aSrcFont);
WriteOpcode_TxSize((sal_uInt16)(aSrcFont.GetSize().Height()));
WriteOpcode_TxMode(eSrcRasterOp);
@@ -1308,14 +1308,14 @@ void PictWriter::SetAttrForText()
void PictWriter::WriteTextArray(Point & rPoint, const OUString& rString, const sal_Int32 * pDXAry)
{
sal_Bool bDelta;
bool bDelta;
Point aPt;
if ( pDXAry == NULL )
WriteOpcode_Text( rPoint, rString, sal_False );
WriteOpcode_Text( rPoint, rString, false );
else
{
bDelta = sal_False;
bDelta = false;
sal_Int32 nLen = rString.getLength();
for ( sal_Int32 i = 0; i < nLen; i++ )
{
@@ -1327,7 +1327,7 @@ void PictWriter::WriteTextArray(Point & rPoint, const OUString& rString, const s
aPt.X() += pDXAry[ i - 1 ];
WriteOpcode_Text( aPt, OUString( c ), bDelta );
bDelta = sal_True;
bDelta = true;
}
}
}
@@ -1415,7 +1415,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
WriteOpcode_PnMode(eSrcRasterOp);
WriteOpcode_PnSize(1);
WriteOpcode_RGBFgCol(pA->GetColor());
WriteOpcode_PnLinePat(sal_True);
WriteOpcode_PnLinePat(true);
WriteOpcode_Line(pA->GetPoint(),pA->GetPoint());
}
break;
@@ -1713,7 +1713,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
SetAttrForText();
OUString aStr = pA->GetText().copy( pA->GetIndex(),pA->GetLen() );
WriteOpcode_Text( aPt, aStr, sal_False );
WriteOpcode_Text( aPt, aStr, false );
}
break;
@@ -2124,9 +2124,9 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
MayCallback();
if (pPict->GetError())
bStatus=sal_False;
bStatus=false;
if (bStatus==sal_False)
if (bStatus==false)
break;
}
}
@@ -2179,13 +2179,13 @@ void PictWriter::UpdateHeader()
}
sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pFilterConfigItem )
bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pFilterConfigItem )
{
PictWriterAttrStackMember* pAt;
MapMode aMap72( MAP_INCH );
Fraction aDPIFrac( 1, 72 );
bStatus=sal_True;
bStatus=true;
nLastPercent=0;
if ( pFilterConfigItem )
@@ -2213,19 +2213,19 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea
pAttrStack=NULL;
bDstBkPatValid=sal_False;
bDstTxFaceValid=sal_False;
bDstTxModeValid=sal_False;
bDstPnSizeValid=sal_False;
bDstPnModeValid=sal_False;
bDstPnPatValid=sal_False;
bDstFillPatValid=sal_False;
bDstTxSizeValid=sal_False;
bDstFgColValid=sal_False;
bDstBkColValid=sal_False;
bDstPenPositionValid=sal_False;
bDstTextPositionValid=sal_False;
bDstFontNameValid=sal_False;
bDstBkPatValid=false;
bDstTxFaceValid=false;
bDstTxModeValid=false;
bDstPnSizeValid=false;
bDstPnModeValid=false;
bDstPnPatValid=false;
bDstFillPatValid=false;
bDstTxSizeValid=false;
bDstFgColValid=false;
bDstBkColValid=false;
bDstPenPositionValid=false;
bDstTextPositionValid=false;
bDstFontNameValid=false;
nNumberOfActions=0;
nNumberOfBitmaps=0;
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index a4343a4..2018a9d 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -35,12 +35,12 @@ private:
SvStream& m_rOStm; // Die auszugebende PPM-Datei
sal_uInt16 mpOStmOldModus;
sal_Bool mbStatus;
bool mbStatus;
sal_Int32 mnMode;
BitmapReadAccess* mpAcc;
sal_uLong mnWidth, mnHeight; // Bildausmass in Pixeln
sal_Bool ImplWriteHeader();
bool ImplWriteHeader();
void ImplWriteBody();
void ImplWriteNumber( sal_Int32 );
@@ -50,7 +50,7 @@ public:
PPMWriter(SvStream &rStrm);
~PPMWriter();
sal_Bool WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
bool WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
//=================== Methods of PPMWriter ==============================
@@ -71,7 +71,7 @@ PPMWriter::~PPMWriter()
sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
if ( pFilterConfigItem )
{
@@ -102,7 +102,7 @@ sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilter
aBmp.ReleaseAccess( mpAcc );
}
else
mbStatus = sal_False;
mbStatus = false;
m_rOStm.SetNumberFormatInt( mpOStmOldModus );
@@ -114,7 +114,7 @@ sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilter
sal_Bool PPMWriter::ImplWriteHeader()
bool PPMWriter::ImplWriteHeader()
{
mnWidth = mpAcc->Width();
mnHeight = mpAcc->Height();
@@ -133,7 +133,7 @@ sal_Bool PPMWriter::ImplWriteHeader()
m_rOStm.WriteUChar( (sal_uInt8)10 );
}
else
mbStatus = sal_False;
mbStatus = false;
return mbStatus;
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 9e5d1aa..505e495 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -71,12 +71,12 @@ struct StackMember
{
struct StackMember * pSucc;
Color aGlobalCol;
sal_Bool bLineCol;
bool bLineCol;
Color aLineCol;
sal_Bool bFillCol;
bool bFillCol;
Color aFillCol;
Color aTextCol;
sal_Bool bTextFillCol;
bool bTextFillCol;
Color aTextFillCol;
Color aBackgroundCol;
Font aFont;
@@ -101,14 +101,14 @@ struct PSLZWCTreeNode
class PSWriter
{
private:
sal_Bool mbStatus;
bool mbStatus;
sal_uLong mnLevelWarning; // number of embedded eps files which was not exported
sal_uLong mnLastPercent; // the number with which pCallback was called the last time
sal_uInt32 mnLatestPush; // offset to streamposition, where last push was done
long mnLevel; // dialog options
sal_Bool mbGrayScale;
sal_Bool mbCompression;
bool mbGrayScale;
bool mbCompression;
sal_Int32 mnPreview;
sal_Int32 mnTextMode;
@@ -125,15 +125,15 @@ private:
StackMember* pGDIStack;
sal_uLong mnCursorPos; // current cursor position in output
Color aColor; // current color which is used for output
sal_Bool bLineColor;
bool bLineColor;
Color aLineColor; // current GDIMetafile color settings
sal_Bool bFillColor;
bool bFillColor;
Color aFillColor;
Color aTextColor;
sal_Bool bTextFillColor;
bool bTextFillColor;
Color aTextFillColor;
Color aBackgroundColor;
sal_Bool bRegionChanged;
bool bRegionChanged;
TextAlign eTextAlign;
double fLineWidth;
@@ -204,7 +204,7 @@ private:
void ImplRectFill ( const Rectangle & rRectangle );
void ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev );
void ImplIntersect( const PolyPolygon& rPolyPoly );
void ImplPolyPoly( const PolyPolygon & rPolyPolygon, sal_Bool bTextOutline = sal_False );
void ImplPolyPoly( const PolyPolygon & rPolyPolygon, bool bTextOutline = false );
void ImplPolyLine( const Polygon & rPolygon );
void ImplSetClipRegion( Region& rRegion );
@@ -212,7 +212,7 @@ private:
void ImplText( const OUString& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
void ImplSetAttrForText( const Point & rPoint );
void ImplWriteCharacter( sal_Char );
void ImplWriteString( const OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False );
void ImplWriteString( const OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, bool bStretch = false );
void ImplDefineFont( const char*, const char* );
void ImplClosePathDraw( sal_uLong nMode = PS_RET );
@@ -225,7 +225,7 @@ private:
double ImplGetScaling( const MapMode& );
void ImplGetMapMode( const MapMode& );
sal_Bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize );
bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize );
sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize );
// LZW methods
void StartCompression();
@@ -234,7 +234,7 @@ private:
inline void WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen );
public:
sal_Bool WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* );
bool WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* );
PSWriter();
~PSWriter();
};
@@ -244,13 +244,13 @@ public:
PSWriter::PSWriter()
: mbStatus(sal_False)
: mbStatus(false)
, mnLevelWarning(0)
, mnLastPercent(0)
, mnLatestPush(0)
, mnLevel(0)
, mbGrayScale(sal_False)
, mbCompression(sal_False)
, mbGrayScale(false)
, mbCompression(false)
, mnPreview(0)
, mnTextMode(0)
, mpPS(NULL)
@@ -264,15 +264,15 @@ PSWriter::PSWriter()
, pGDIStack(NULL)
, mnCursorPos(0)
, aColor()
, bLineColor(sal_False)
, bLineColor(false)
, aLineColor()
, bFillColor(sal_False)
, bFillColor(false)
, aFillColor()
, aTextColor()
, bTextFillColor(sal_False)
, bTextFillColor(false)
, aTextFillColor()
, aBackgroundColor()
, bRegionChanged(sal_False)
, bRegionChanged(false)
, eTextAlign()
, fLineWidth(0)
, fMiterLimit(0)
@@ -306,11 +306,11 @@ PSWriter::~PSWriter()
sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
{
sal_uInt32 nStreamPosition = 0, nPSPosition = 0; // -Wall warning, unset, check
mbStatus = sal_True;
mbStatus = true;
mnPreview = 0;
mnLevelWarning = 0;
mnLastPercent = 0;
@@ -331,9 +331,9 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
// default values for the dialog options
mnLevel = 2;
mbGrayScale = sal_False;
mbGrayScale = false;
#ifdef UNX // don't compress by default on unix as ghostscript is unable to read LZW compressed eps
mbCompression = sal_False;
mbCompression = false;
#else
mbCompression = sal_True;
#endif
@@ -369,8 +369,8 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
// compression is not available for Level 1
if ( mnLevel == 1 )
{
mbGrayScale = sal_True;
mbCompression = sal_False;
mbGrayScale = true;
mbCompression = false;
}
if ( mnPreview & EPS_PREVIEW_TIFF )
@@ -431,11 +431,11 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
pGDIStack = NULL;
aColor = Color( COL_TRANSPARENT );
bLineColor = sal_True;
bLineColor = true;
aLineColor = Color( COL_BLACK );
bFillColor = sal_True;
bFillColor = true;
aFillColor = Color( COL_WHITE );
bTextFillColor = sal_True;
bTextFillColor = true;
aTextFillColor = Color( COL_BLACK );
fLineWidth = 1;
fMiterLimit = 15; // use same limit as most graphic systems and basegfx
@@ -443,7 +443,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
eJoinType = SvtGraphicStroke::joinMiter;
aBackgroundColor = Color( COL_WHITE );
eTextAlign = ALIGN_BASELINE;
bRegionChanged = sal_False;
bRegionChanged = false;
nChrSet = 0x00;
pChrSetList = NULL;
@@ -477,7 +477,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
}
}
else
mbStatus = sal_False;
mbStatus = false;
if ( mbStatus && mnLevelWarning && pFilterConfigItem )
{
@@ -1032,11 +1032,11 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
if ( ( (const MetaLineColorAction*) pMA)->IsSetting() )
{
bLineColor = sal_True;
bLineColor = true;
aLineColor = ( (const MetaLineColorAction*) pMA )->GetColor();
}
else
bLineColor = sal_False;
bLineColor = false;
}
break;
@@ -1044,11 +1044,11 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
if ( ( (const MetaFillColorAction*) pMA )->IsSetting() )
{
bFillColor = sal_True;
bFillColor = true;
aFillColor = ( (const MetaFillColorAction*) pMA )->GetColor();
}
else
bFillColor = sal_False;
bFillColor = false;
}
break;
@@ -1062,11 +1062,11 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
if ( ( (const MetaTextFillColorAction*) pMA )->IsSetting() )
{
bTextFillColor = sal_True;
bTextFillColor = true;
aTextFillColor = ( (const MetaTextFillColorAction*) pMA )->GetColor();
}
else
bTextFillColor = sal_False;
bTextFillColor = false;
}
break;
@@ -1111,7 +1111,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
pGS->bTextFillCol = bTextFillColor;
pGS->aTextFillCol = aTextFillColor;
pGS->aBackgroundCol = aBackgroundColor;
bRegionChanged = sal_False;
bRegionChanged = false;
pGS->aFont = maFont;
mnLatestPush = mpPS->Tell();
ImplWriteLine( "gs" );
@@ -1162,7 +1162,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
GfxLink aGfxLink = ( (const MetaEPSAction*) pMA )->GetLink();
const GDIMetaFile aSubstitute( ( ( const MetaEPSAction*) pMA )->GetSubstitute() );
sal_Bool bLevelConflict = sal_False;
bool bLevelConflict = false;
sal_uInt8* pSource = (sal_uInt8*) aGfxLink.GetData();
sal_uLong nSize = aGfxLink.GetDataSize();
sal_uLong nParseThis = POSTSCRIPT_BOUNDINGSEARCH;
@@ -1185,7 +1185,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
if ( k != '1' )
{
bLevelConflict = sal_True;
bLevelConflict = true;
mnLevelWarning++;
}
break;
@@ -1292,7 +1292,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
if ( pData )
{
SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
sal_Bool bSkipSequence = sal_False;
bool bSkipSequence = false;
OString sSeqEnd;
if( pA->GetComment().equals( "XPATHSTROKE_SEQ_BEGIN" ) )
@@ -1315,15 +1315,15 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
aStroke.getEndArrow( aEndArrow );
aStroke.getDashArray( l_aDashArray );
bSkipSequence = sal_True;
bSkipSequence = true;
if ( l_aDashArray.size() > 11 ) // ps dasharray limit is 11
bSkipSequence = sal_False;
bSkipSequence = false;
if ( aStartArrow.Count() || aEndArrow.Count() )
bSkipSequence = sal_False;
bSkipSequence = false;
if ( (sal_uInt32)eJT > 2 )
bSkipSequence = sal_False;
bSkipSequence = false;
if ( l_aDashArray.size() && ( fStrokeWidth != 0.0 ) )
bSkipSequence = sal_False;
bSkipSequence = false;
if ( bSkipSequence )
{
ImplWriteLineInfo( fStrokeWidth, aStroke.getMiterLimit(),
@@ -1340,7 +1340,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
case SvtGraphicFill::fillSolid :
{
bSkipSequence = sal_True;
bSkipSequence = true;
PolyPolygon aPolyPoly;
aFill.getPath( aPolyPoly );
sal_uInt16 i, nPolyCount = aPolyPoly.Count();
@@ -1385,7 +1385,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
sal_uInt32 nBitmapCount = 0;
sal_uInt32 nBitmapAction = 0;
sal_Bool bOk = sal_True;
bool bOk = true;
while( bOk && ( ++nCurAction < nCount ) )
{
MetaAction* pAction = rMtf.GetAction( nCurAction );
@@ -1403,7 +1403,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_COMMENT_ACTION :
{
if (((const MetaCommentAction*)pAction)->GetComment().equals("XPATHFILL_SEQ_END"))
bOk = sal_False;
bOk = false;
}
break;
}
@@ -1617,7 +1617,7 @@ void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient&
void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutline )
void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, bool bTextOutline )
{
sal_uInt16 i, nPolyCount = rPolyPoly.Count();
if ( nPolyCount )
@@ -1779,14 +1779,14 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi
long nHeight = nHeightLeft;
double nYHeight = nYHeightOrg;
sal_Bool bDoTrans = sal_False;
bool bDoTrans = false;
Rectangle aRect;
Region aRegion;
if ( pMaskBitmap )
{
bDoTrans = sal_True;
bDoTrans = true;
while (true)
{
if ( mnLevel == 1 )
@@ -2100,7 +2100,7 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar )
void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch )
void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, bool bStretch )
{
sal_Int32 nLen = rString.getLength();
if ( nLen )
@@ -2156,8 +2156,8 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sa
aPolyDummy.Rotate( rPos, nRotation );
aPos = aPolyDummy.GetPoint( 0 );
}
sal_Bool bOldLineColor = bLineColor;
bLineColor = sal_False;
bool bOldLineColor = bLineColor;
bLineColor = false;
std::vector<PolyPolygon> aPolyPolyVec;
if ( aVirDev.GetTextOutlines( aPolyPolyVec, rUniString, 0, 0, -1, true, nWidth, pDXArry ) )
{
@@ -2173,7 +2173,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sa
}
std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() );
while ( aIter != aPolyPolyVec.end() )
ImplPolyPoly( *aIter++, sal_True );
ImplPolyPoly( *aIter++, true );
ImplWriteLine( "pom" );
}
bLineColor = bOldLineColor;
@@ -2775,13 +2775,13 @@ sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_
sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize )
bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize )
{
sal_Bool bRetValue = sal_False;
bool bRetValue = false;
sal_uLong nBytesRead;
if ( nSize < 256 ) // we assume that the file is greater than 256 bytes
return sal_False;
return false;
if ( nSize < POSTSCRIPT_BOUNDINGSEARCH )
nBytesRead = nSize;
@@ -2797,9 +2797,9 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL
for ( int i = 0; ( i < 4 ) && nSecurityCount; i++ )
{
int nDivision = 1;
sal_Bool bDivision = sal_False;
sal_Bool bNegative = sal_False;
sal_Bool bValid = sal_True;
bool bDivision = false;
bool bNegative = false;
bool bValid = true;
while ( ( --nSecurityCount ) && ( ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) )
pDest++;
@@ -2810,12 +2810,12 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL
{
case '.' :
if ( bDivision )
bValid = sal_False;
bValid = false;
else
bDivision = sal_True;
bDivision = true;
break;
case '-' :
bNegative = sal_True;
bNegative = true;
break;
default :
if ( ( nByte < '0' ) || ( nByte > '9' ) )
@@ -2838,7 +2838,7 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL
nNumb[i] /= nDivision;
}
if ( nSecurityCount)
bRetValue = sal_True;
bRetValue = true;
}
return bRetValue;
}
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index ef73de3..d9bf00f 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -31,7 +31,7 @@ private:
SvStream & m_rOStm;
sal_Bool mbStatus;
bool mbStatus;
BitmapReadAccess* mpAcc;
sal_uLong mnWidth, mnHeight;
@@ -43,7 +43,7 @@ private:
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uLong nCurrentYPos );
sal_Bool ImplWriteHeader();
bool ImplWriteHeader();
void ImplWritePalette();
void ImplWriteBody();
void ImplPutByte( sal_uInt8 ); // RLE decoding
@@ -52,13 +52,13 @@ public:
RASWriter(SvStream &rStream);
~RASWriter();
sal_Bool WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
bool WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
//=================== Methoden von RASWriter ==============================
RASWriter::RASWriter(SvStream &rStream)
: m_rOStm(rStream)
, mbStatus(sal_True)
, mbStatus(true)
, mpAcc(NULL)
, mnWidth(0)
, mnHeight(0)
@@ -83,7 +83,7 @@ void RASWriter::ImplCallback( sal_uLong nYPos )
sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
Bitmap aBmp;
@@ -126,7 +126,7 @@ sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilter
aBmp.ReleaseAccess( mpAcc );
}
else
mbStatus = sal_False;
mbStatus = false;
if ( xStatusIndicator.is() )
xStatusIndicator->end();
@@ -136,7 +136,7 @@ sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilter
sal_Bool RASWriter::ImplWriteHeader()
bool RASWriter::ImplWriteHeader()
{
mnWidth = mpAcc->Width();
mnHeight = mpAcc->Height();
@@ -144,7 +144,7 @@ sal_Bool RASWriter::ImplWriteHeader()
{
mnColors = mpAcc->GetPaletteEntryCount();
if (mnColors == 0)
mbStatus = sal_False;
mbStatus = false;
}
if ( mbStatus && mnWidth && mnHeight && mnDepth )
{
@@ -161,7 +161,7 @@ sal_Bool RASWriter::ImplWriteHeader()
m_rOStm.WriteUInt32( (sal_uInt32)1 ).WriteUInt32( (sal_uInt32)( mnColors * 3 ) );
}
}
else mbStatus = sal_False;
else mbStatus = false;
return mbStatus;
}
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index cad7c60..ffa253c 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -62,7 +62,7 @@ private:
SvStream& m_rOStm;
sal_uInt32 mnStreamOfs;
sal_Bool mbStatus;
bool mbStatus;
BitmapReadAccess* mpAcc;
sal_uInt32 mnWidth, mnHeight, mnColors;
@@ -95,9 +95,9 @@ private:
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uInt32 nPercent );
sal_Bool ImplWriteHeader( sal_Bool bMultiPage );
bool ImplWriteHeader( bool bMultiPage );
void ImplWritePalette();
sal_Bool ImplWriteBody();
bool ImplWriteBody();
void ImplWriteTag( sal_uInt16 TagID, sal_uInt16 DataType, sal_uInt32 NumberOfItems, sal_uInt32 Value);
void ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit );
void StartCompression();
@@ -110,14 +110,14 @@ public:
TIFFWriter(SvStream &rStream);
~TIFFWriter();
sal_Bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
TIFFWriter::TIFFWriter(SvStream &rStream)
: m_rOStm(rStream)
, mbStatus(sal_True)
, mbStatus(true)
, mpAcc(NULL)
, mnCurAllPictHeight(0)
, mnSumOfAllPictHeight(0)
@@ -137,7 +137,7 @@ TIFFWriter::~TIFFWriter()
sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
sal_uLong* pDummy = new sal_uLong; delete pDummy; // So that under OS/2
// the right (tools-)new
@@ -217,7 +217,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt
aBmp.ReleaseAccess( mpAcc );
}
else
mbStatus = sal_False;
mbStatus = false;
}
}
m_rOStm.SetNumberFormatInt( nOldFormat );
@@ -246,7 +246,7 @@ void TIFFWriter::ImplCallback( sal_uInt32 nPercent )
sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage )
bool TIFFWriter::ImplWriteHeader( bool bMultiPage )
{
mnTagCount = 0;
mnWidth = mpAcc->Width();
@@ -314,7 +314,7 @@ sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage )
m_rOStm.WriteUInt32( (sal_uInt32)0 ); // there are no more IFD
}
else
mbStatus = sal_False;
mbStatus = false;
return mbStatus;
}
@@ -348,7 +348,7 @@ void TIFFWriter::ImplWritePalette()
sal_Bool TIFFWriter::ImplWriteBody()
bool TIFFWriter::ImplWriteBody()
{
sal_uInt8 nTemp = 0;
sal_uInt8 nShift;
@@ -437,7 +437,7 @@ sal_Bool TIFFWriter::ImplWriteBody()
default:
{
mbStatus = sal_False;
mbStatus = false;
}
break;
}
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index dc19f67..3bc25d5 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -30,8 +30,8 @@ private:
SvStream& m_rOStm; // the output XPM file
sal_Bool mbStatus;
sal_Bool mbTrans;
bool mbStatus;
bool mbTrans;
BitmapReadAccess* mpAcc;
sal_uLong mnWidth, mnHeight; // size in Pixel
sal_uInt16 mnColors;
@@ -39,7 +39,7 @@ private:
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uInt16 nPercent );
sal_Bool ImplWriteHeader();
bool ImplWriteHeader();
void ImplWritePalette();
void ImplWriteColor( sal_uInt16 );
void ImplWriteBody();
@@ -50,15 +50,15 @@ public:
XPMWriter(SvStream& rOStm);
~XPMWriter();
sal_Bool WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
bool WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
//=================== Methoden von XPMWriter ==============================
XPMWriter::XPMWriter(SvStream& rOStm)
: m_rOStm(rOStm)
, mbStatus(sal_True)
, mbTrans(sal_False)
, mbStatus(true)
, mbTrans(false)
, mpAcc(NULL)
, mnWidth(0)
, mnHeight(0)
@@ -85,7 +85,7 @@ void XPMWriter::ImplCallback( sal_uInt16 nPercent )
sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
Bitmap aBmp;
@@ -104,7 +104,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter
if ( rGraphic.IsTransparent() ) // possibly create transparent color
{
mbTrans = sal_True;
mbTrans = true;
if ( aBmp.GetBitCount() >= 8 ) // if necessary convert image to 8 bit
aBmp.Convert( BMP_CONVERSION_8BIT_TRANS );
else
@@ -135,7 +135,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter
aBmp.ReleaseAccess( mpAcc );
}
else
mbStatus = sal_False;
mbStatus = false;
if ( xStatusIndicator.is() )
@@ -146,7 +146,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter
sal_Bool XPMWriter::ImplWriteHeader()
bool XPMWriter::ImplWriteHeader()
{
mnWidth = mpAcc->Width();
mnHeight = mpAcc->Height();
@@ -162,7 +162,7 @@ sal_Bool XPMWriter::ImplWriteHeader()
ImplWriteNumber( ( mnColors > 26 ) ? 2 : 1 );
m_rOStm.WriteCharPtr( "\x22,\x0a" );
}
else mbStatus = sal_False;
else mbStatus = false;
return mbStatus;
}
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index d4aaf10..43ff940 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -53,7 +53,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod
CGMOutAct ( rCGM ),
nFinalTextCount ( 0 )
{
sal_Bool bStatRet = sal_False;
bool bStatRet = false;
if ( mpCGM->mbStatus )
{
@@ -68,7 +68,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod
{
maXDrawPage = *(uno::Reference< drawing::XDrawPage > *)maXDrawPages->getByIndex( 0 ).getValue();
if ( ImplInitPage() )
bStatRet = sal_True;
bStatRet = true;
}
}
}
@@ -78,15 +78,15 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod
sal_Bool CGMImpressOutAct::ImplInitPage()
bool CGMImpressOutAct::ImplInitPage()
{
sal_Bool bStatRet = sal_False;
bool bStatRet = false;
if( maXDrawPage.is() )
{
maXShapes = uno::Reference< drawing::XShapes >( maXDrawPage, uno::UNO_QUERY );
if ( maXShapes.is() )
{
bStatRet = sal_True;
bStatRet = true;
}
}
return bStatRet;
@@ -94,7 +94,7 @@ sal_Bool CGMImpressOutAct::ImplInitPage()
sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType )
bool CGMImpressOutAct::ImplCreateShape( const OUString& rType )
{
uno::Reference< uno::XInterface > xNewShape( maXMultiServiceFactory->createInstance( rType ) );
maXShape = uno::Reference< drawing::XShape >( xNewShape, uno::UNO_QUERY );
@@ -102,9 +102,9 @@ sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType )
if ( maXShape.is() && maXPropSet.is() )
{
maXShapes->add( maXShape );
return sal_True;
return true;
}
return sal_False;
return false;
}
@@ -397,8 +397,8 @@ void CGMImpressOutAct::InsertPage()
{
uno::Reference< drawing::XDrawPage > xPage( maXDrawPages->insertNewByIndex( 0xffff ), uno::UNO_QUERY );
maXDrawPage = xPage;
if ( ImplInitPage() == sal_False )
mpCGM->mbStatus = sal_False;
if ( ImplInitPage() == false )
mpCGM->mbStatus = false;
}
mnCurrentPage++;
};
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index a5ca20b..ee03b66 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -40,7 +40,7 @@ CGMBitmap::~CGMBitmap()
void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
{
rDesc.mbStatus = sal_True;
rDesc.mbStatus = true;
if ( ImplGetDimensions( rDesc ) && rDesc.mpBuf )
{
@@ -190,27 +190,27 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
}
else
{
rDesc.mbVMirror = sal_True;
rDesc.mbVMirror = true;
rDesc.mnOrigin = rDesc.mnP;
rDesc.mnOrigin.X += rDesc.mnQ.X - rDesc.mnR.X;
rDesc.mnOrigin.Y += rDesc.mnQ.Y - rDesc.mnR.Y;
}
}
else
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
}
else
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
}
else
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
if ( rDesc.mpAcc )
{
rDesc.mpBitmap->ReleaseAccess( rDesc.mpAcc );
rDesc.mpAcc = NULL;
}
if ( rDesc.mbStatus == sal_False )
if ( rDesc.mbStatus == false )
{
if ( rDesc.mpBitmap )
{
@@ -235,7 +235,7 @@ void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc )
sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
{
mpCGM->ImplGetPoint( rDesc.mnP ); // parallelogram p < - > r
mpCGM->ImplGetPoint( rDesc.mnQ ); // |
@@ -270,7 +270,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
break;
case 16 : // NS
case -16 :
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
break;
case 24 : // 24 bit directColor ( 8 bits each component )
case -24 :
@@ -278,17 +278,17 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
break;
case 32 : // NS
case -32 :
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
break;
}
// mnCompressionMode == 0 : CCOMP_RUNLENGTH
// == 1 : CCOMP_PACKED ( no compression. each row starts on a 4 byte boundary )
if ( ( rDesc.mnCompressionMode = mpCGM->ImplGetUI16() ) != 1 )
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
if ( !( rDesc.mnX || rDesc.mnY ) )
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
sal_uInt32 nHeaderSize = 2 + 3 * nPrecision + 3 * mpCGM->ImplGetPointSize();
rDesc.mnScanSize = ( ( rDesc.mnX * rDesc.mnDstBitsPerPixel + 7 ) >> 3 );
@@ -310,7 +310,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
if ( ( nScanSize * ( rDesc.mnY - 1 ) + rDesc.mnScanSize + nHeaderSize ) != mpCGM->mnElementSize )
{
mpCGM->mnParaSize = 0; // this format is corrupt
rDesc.mbStatus = sal_False;
rDesc.mbStatus = false;
}
}
}
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index 7017984..4b51352 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -31,9 +31,9 @@ class CGMBitmapDescriptor
sal_uInt8* mpBuf;
Bitmap* mpBitmap;
BitmapWriteAccess* mpAcc;
sal_Bool mbStatus;
sal_Bool mbVMirror;
sal_Bool mbHMirror;
bool mbStatus;
bool mbVMirror;
bool mbHMirror;
sal_uInt32 mnDstBitsPerPixel;
sal_uInt32 mnScanSize; // bytes per line
FloatPoint mnP, mnQ, mnR;
@@ -50,9 +50,9 @@ class CGMBitmapDescriptor
: mpBuf(NULL)
, mpBitmap(NULL)
, mpAcc(NULL)
, mbStatus(sal_False)
, mbVMirror(sal_False)
, mbHMirror(sal_False)
, mbStatus(false)
, mbVMirror(false)
, mbHMirror(false)
, mnDstBitsPerPixel(0)
, mnScanSize(0)
, mndx(0.0)
@@ -76,7 +76,7 @@ class CGMBitmap
{
CGM* mpCGM;
CGMBitmapDescriptor* pCGMBitmapDescriptor;
sal_Bool ImplGetDimensions( CGMBitmapDescriptor& );
bool ImplGetDimensions( CGMBitmapDescriptor& );
void ImplSetCurrentPalette( CGMBitmapDescriptor& );
void ImplGetBitmap( CGMBitmapDescriptor& );
void ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest );
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 003b725..780b5af 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -143,7 +143,7 @@ long CGM::ImplGetI( sal_uInt32 nPrecision )
return (sal_Int32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
}
default:
mbStatus = sal_False;
mbStatus = false;
return 0;
}
}
@@ -169,7 +169,7 @@ sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
return (sal_uInt32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
}
default:
mbStatus = sal_False;
mbStatus = false;
return 0;
}
}
@@ -194,7 +194,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
{
void* pPtr;
sal_uInt8 aBuf[8];
sal_Bool bCompatible;
bool bCompatible;
double nRetValue;
double fDoubleBuf;
float fFloatBuf;
@@ -202,7 +202,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
#ifdef OSL_BIGENDIAN
bCompatible = sal_True;
#else
bCompatible = sal_False;
bCompatible = false;
#endif
if ( bCompatible )
pPtr = mpSource + mnParaSize;
@@ -287,7 +287,7 @@ inline double CGM::ImplGetFY()
return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCYadd ) * mnVDCYmul );
}
void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap )
void CGM::ImplGetPoint( FloatPoint& rFloatPoint, bool bMap )
{
if ( pElement->eVDCType == VDC_INTEGER )
{
@@ -303,7 +303,7 @@ void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap )
ImplMapPoint( rFloatPoint );
}
void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap )
void CGM::ImplGetRectangle( FloatRect& rFloatRect, bool bMap )
{
if ( pElement->eVDCType == VDC_INTEGER )
{
@@ -347,7 +347,7 @@ void CGM::ImplGetRectangleNS( FloatRect& rFloatRect )
}
}
sal_uInt32 CGM::ImplGetBitmapColor( sal_Bool bDirect )
sal_uInt32 CGM::ImplGetBitmapColor( bool bDirect )
{
// the background color is always a direct color
@@ -409,9 +409,9 @@ void CGM::ImplSetMapMode()
mnVDCYmul = -1;
}
if ( nAngReverse )
mbAngReverse = sal_True;
mbAngReverse = true;
else
mbAngReverse = sal_False;
mbAngReverse = false;
double fQuo1 = mnVDCdx / mnVDCdy;
double fQuo2 = mnOutdx / mnOutdy;
@@ -669,7 +669,7 @@ void CGM::ImplDefaultReplacement()
}
}
sal_Bool CGM::Write( SvStream& rIStm )
bool CGM::Write( SvStream& rIStm )
{
if ( !mpBuf )
mpBuf = new sal_uInt8[ 0xffff ];
@@ -713,7 +713,7 @@ ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_u
sal_uInt32 nStatus = 0; // retvalue == 0 -> ERROR
// == 0xffrrggbb -> background color in the lower 24 bits
sal_Bool bProgressBar = sal_False;
bool bProgressBar = false;
if( rXModel.is() )
{
@@ -759,7 +759,7 @@ ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_u
}
#endif
if ( pCGM->Write( *pIn ) == sal_False )
if ( pCGM->Write( *pIn ) == false )
break;
}
if ( pCGM->IsValid() )
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index ab7076d1..3bdd0c3 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -59,17 +59,17 @@ class CGM
double mnVDCdy;
double mnXFraction;
double mnYFraction;
sal_Bool mbAngReverse; // AngularDirection
bool mbAngReverse; // AngularDirection
Graphic* mpGraphic; // ifdef CGM_EXPORT_META
sal_Bool mbStatus;
sal_Bool mbMetaFile;
sal_Bool mbIsFinished;
sal_Bool mbPicture;
sal_Bool mbPictureBody;
sal_Bool mbFigure;
sal_Bool mbFirstOutPut;
bool mbStatus;
bool mbMetaFile;
bool mbIsFinished;
bool mbPicture;
bool mbPictureBody;
bool mbFigure;
bool mbFirstOutPut;
sal_uInt32 mnAct4PostReset;
CGMBitmap* mpBitmapInUse;
CGMChart* mpChart; // if sal_True->"SHWSLIDEREC"
@@ -101,7 +101,7 @@ class CGM
void ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest );
void ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest );
double ImplGetFloat( RealPrecision, sal_uInt32 nRealSize );
sal_uInt32 ImplGetBitmapColor( sal_Bool bDirectColor = sal_False );
sal_uInt32 ImplGetBitmapColor( bool bDirectColor = false );
void ImplSetMapMode();
void ImplMapDouble( double& );
void ImplMapX( double& );
@@ -112,13 +112,13 @@ class CGM
inline double ImplGetIX();
inline double ImplGetFX();
sal_uInt32 ImplGetPointSize();
void ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap = sal_False );
void ImplGetRectangle( FloatRect&, sal_Bool bMap = sal_False );
void ImplGetPoint( FloatPoint& rFloatPoint, bool bMap = false );
void ImplGetRectangle( FloatRect&, bool bMap = false );
void ImplGetRectangleNS( FloatRect& );
void ImplGetVector( double* );
double ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint );
void ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle );
sal_Bool ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rOrientation );
bool ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rOrientation );
void ImplDefaultReplacement();
void ImplDoClass();
@@ -144,9 +144,9 @@ class CGM
GDIMetaFile* mpGDIMetaFile;
#endif
sal_uInt32 GetBackGroundColor();
sal_Bool IsValid() const { return mbStatus; };
sal_Bool IsFinished() const { return mbIsFinished; };
sal_Bool Write( SvStream& rIStm );
bool IsValid() const { return mbStatus; };
bool IsFinished() const { return mbIsFinished; };
bool Write( SvStream& rIStm );
friend SvStream& ReadCGM( SvStream& rOStm, CGM& rCGM );
diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx
index 6d6f653f..5421af80 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -90,7 +90,7 @@ void CGMChart::ResetAnnotation()
sal_Bool CGMChart::IsAnnotation()
bool CGMChart::IsAnnotation()
{
return ( mDataNode[ 0 ].nZoneEnum == 0 );
};
diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx
index e91660e..6d16dc3 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -233,7 +233,7 @@ class CGMChart
void InsertTextEntry( TextEntry* );
void ResetAnnotation();
sal_Bool IsAnnotation();
bool IsAnnotation();
};
#endif
diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index 3ef4097..9b0abed 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -29,7 +29,7 @@ void CGM::ImplDoClass0()
case 0x01 : /*Begin Metafile*/
{
ImplSetMapMode();
mbMetaFile = sal_True;
mbMetaFile = true;
}
break;
case 0x02 : /*End MetaFile*/
@@ -42,9 +42,9 @@ void CGM::ImplDoClass0()
delete mpBitmapInUse;
mpBitmapInUse = NULL;
}
mbIsFinished = sal_True;
mbPictureBody = sal_False;
mbMetaFile = sal_False;
mbIsFinished = true;
mbPictureBody = false;
mbMetaFile = false;
}
break;
case 0x03 : /*Begin Picture*/
@@ -52,12 +52,12 @@ void CGM::ImplDoClass0()
ImplDefaultReplacement();
ImplSetMapMode();
if ( mbPicture )
mbStatus = sal_False;
mbStatus = false;
else
{
*pCopyOfE = *pElement;
mbPicture = mbFirstOutPut = sal_True;
mbFigure = sal_False;
mbPicture = mbFirstOutPut = true;
mbFigure = false;
mnAct4PostReset = 0;
if ( mpChart == NULL ) // normal CGM Files determines "BeginPic"
mpOutAct->InsertPage(); // as the next slide
@@ -65,7 +65,7 @@ void CGM::ImplDoClass0()
}
break;
case 0x04 : /*Begin Picture Body*/
mbPictureBody = sal_True;
mbPictureBody = true;
break;
case 0x05 : /* End Picture*/
{
@@ -82,25 +82,25 @@ void CGM::ImplDoClass0()
mpOutAct->EndFigure(); // close potential figures
mpOutAct->EndGrouping(); // finish potential groups
*pElement = *pCopyOfE;
mbFigure = mbFirstOutPut = mbPicture = mbPictureBody = sal_False;
mbFigure = mbFirstOutPut = mbPicture = mbPictureBody = false;
}
else
mbStatus = sal_False;
mbStatus = false;
}
break;
case 0x06 : /*Begin Segment*/
pElement->bSegmentCount = sal_True;
pElement->bSegmentCount = true;
break;
case 0x07 : /*End Segment*/
pElement->bSegmentCount = sal_True;
pElement->bSegmentCount = true;
break;
case 0x08 : /*Begin Figure*/
mbFigure = sal_True;
mbFigure = true;
mpOutAct->BeginFigure();
break;
case 0x09 : /*End Figure*/
mpOutAct->EndFigure();
mbFigure = sal_False;
mbFigure = false;
break;
case 0x0d : /*Begin Protection Region */break;
case 0x0e : /*End Protection Region */break;
diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx
index f908295..1eae8c5 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -40,7 +40,7 @@ void CGM::ImplDoClass1()
{
case 0 : pElement->eVDCType = VDC_INTEGER; break;
case 1 : pElement->eVDCType = VDC_REAL; break;
default: mbStatus = sal_False; break;
default: mbStatus = false; break;
}
}
break;
@@ -53,7 +53,7 @@ void CGM::ImplDoClass1()
case 24 :
case 16 :
case 8 : pElement->nIntegerPrecision = nInteger >> 3; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -70,32 +70,32 @@ void CGM::ImplDoClass1()
{
case 9 :
if ( nI1 != 23 )
mbStatus = sal_False;
mbStatus = false;
pElement->nRealSize = 4;
break;
case 12 :
if ( nI1 != 52 )
mbStatus =sal_False;
mbStatus =false;
pElement->nRealSize = 8;
break;
default:
mbStatus = sal_False;
mbStatus = false;
break;
}
break;
case 1 :
pElement->eRealPrecision = RP_FIXED;
if ( nI0 != nI1 )
mbStatus = sal_False;
mbStatus = false;
if ( nI0 == 16 )
pElement->nRealSize = 4;
else if ( nI0 == 32 )
pElement->nRealSize = 8;
else
mbStatus = sal_False;
mbStatus = false;
break;
default :
mbStatus = sal_False; break;
mbStatus = false; break;
}
}
break;
@@ -108,7 +108,7 @@ void CGM::ImplDoClass1()
case 24 :
case 16 :
case 8 : pElement->nIndexPrecision = nInteger >> 3; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -121,7 +121,7 @@ void CGM::ImplDoClass1()
case 24 :
case 16 :
case 8 : pElement->nColorPrecision = nInteger >> 3; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -134,7 +134,7 @@ void CGM::ImplDoClass1()
case 24 :
case 16 :
case 8 : pElement->nColorIndexPrecision = nInteger >> 3; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -142,7 +142,7 @@ void CGM::ImplDoClass1()
{
pElement->nColorMaximumIndex = ImplGetUI( pElement->nColorIndexPrecision );
if ( ( pElement->nColorMaximumIndex > 256 /*255*/ ) || ( pElement->nColorMaximumIndex == 0 ) )
mbStatus = sal_False;
mbStatus = false;
}
break;
case 0x0a : /*Color Value Extent*/
@@ -152,7 +152,7 @@ void CGM::ImplDoClass1()
else
{
nI1 = 8;
mbStatus = sal_False; // CMYK is not supported
mbStatus = false; // CMYK is not supported
}
for ( nI0 = 0; nI0 < nI1; nI0++ )
{
diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx
index 3012eee..df8cbdf 100644
--- a/filter/source/graphicfilter/icgm/class2.cxx
+++ b/filter/source/graphicfilter/icgm/class2.cxx
@@ -35,7 +35,7 @@ void CGM::ImplDoClass2()
{
case 0 : pElement->eScalingMode = SM_ABSTRACT; break;
case 1 : pElement->eScalingMode = SM_METRIC; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
pElement->nScalingFactor = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
ImplSetMapMode();
@@ -49,7 +49,7 @@ void CGM::ImplDoClass2()
{
case 0 : pElement->eColorSelectionMode = CSM_INDEXED; break;
case 1 : pElement->eColorSelectionMode = CSM_DIRECT; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -60,7 +60,7 @@ void CGM::ImplDoClass2()
{
case 0 : pElement->eLineWidthSpecMode = SM_ABSOLUTE; break;
case 1 : pElement->eLineWidthSpecMode = SM_SCALED; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -71,7 +71,7 @@ void CGM::ImplDoClass2()
{
case 0 : pElement->eMarkerSizeSpecMode = SM_ABSOLUTE; break;
case 1 : pElement->eMarkerSizeSpecMode = SM_SCALED; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -82,7 +82,7 @@ void CGM::ImplDoClass2()
{
case 0 : pElement->eEdgeWidthSpecMode = SM_ABSOLUTE; break;
case 1 : pElement->eEdgeWidthSpecMode = SM_SCALED; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -93,7 +93,7 @@ void CGM::ImplDoClass2()
}
break;
case 0x07 : /*Background Color*/
pElement->nBackGroundColor = ImplGetBitmapColor( sal_True );
pElement->nBackGroundColor = ImplGetBitmapColor( true );
break;
case 0x08 : /*Device Viewport*/
{
@@ -110,7 +110,7 @@ void CGM::ImplDoClass2()
case 0 : pElement->eDeviceViewPortMode = DVPM_FRACTION; break;
case 1 : pElement->eDeviceViewPortMode = DVPM_METRIC; break;
case 2 : pElement->eDeviceViewPortMode = DVPM_DEVICE; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
pElement->nDeviceViewPortScale = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
ImplSetMapMode();
@@ -122,21 +122,21 @@ void CGM::ImplDoClass2()
{
case 0 : pElement->eDeviceViewPortMap = DVPM_NOT_FORCED; break;
case 1 : pElement->eDeviceViewPortMap = DVPM_FORCED; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
switch( ImplGetUI16() )
{
case 0 : pElement->eDeviceViewPortMapH = DVPMH_LEFT; break;
case 1 : pElement->eDeviceViewPortMapH = DVPMH_CENTER; break;
case 2 : pElement->eDeviceViewPortMapH = CVPMH_RIGHT; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
switch( ImplGetUI16() )
{
case 0 : pElement->eDeviceViewPortMapV = DVPMV_BOTTOM; break;
case 1 : pElement->eDeviceViewPortMapV = DVPMV_CENTER; break;
case 2 : pElement->eDeviceViewPortMapV = DVPMV_TOP; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
ImplSetMapMode();
}
diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx
index 56f96d7..7af6971 100644
--- a/filter/source/graphicfilter/icgm/class3.cxx
+++ b/filter/source/graphicfilter/icgm/class3.cxx
@@ -35,7 +35,7 @@ void CGM::ImplDoClass3()
{
case 16 : pElement->nVDCIntegerPrecision = 2; break;
case 32 : pElement->nVDCIntegerPrecision = 4; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -52,32 +52,32 @@ void CGM::ImplDoClass3()
{
case 9 :
if ( nI1 != 23 )
mbStatus = sal_False;
mbStatus = false;
pElement->nVDCRealSize = 4;
break;
case 12 :
if ( nI1 != 52 )
mbStatus =sal_False;
mbStatus =false;
pElement->nVDCRealSize = 8;
break;
default:
mbStatus = sal_False;
mbStatus = false;
break;
}
break;
case 1 :
pElement->eVDCRealPrecision = RP_FIXED;
if ( nI0 != nI1 )
mbStatus = sal_False;
mbStatus = false;
if ( nI0 == 16 )
pElement->nVDCRealSize = 4;
else if ( nI0 == 32 )
pElement->nVDCRealSize = 8;
else
mbStatus = sal_False;
mbStatus = false;
break;
default :
mbStatus = sal_False; break;
mbStatus = false; break;
}
}
break;
@@ -92,7 +92,7 @@ void CGM::ImplDoClass3()
{
case 0 : pElement->eTransparency = T_OFF; break;
case 1 : pElement->eTransparency = T_ON; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -105,7 +105,7 @@ void CGM::ImplDoClass3()
{
case 0 : pElement->eClipIndicator = CI_OFF; break;
case 1 : pElement->eClipIndicator = CI_ON; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index d92330e..64086a1 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -75,13 +75,13 @@ void CGM::ImplGetVector( double* pVector )
}
sal_Bool CGM::ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rAngle )
bool CGM::ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rAngle )
{
FloatPoint aPoint1, aPoint2;
double fRot1, fRot2;
ImplGetPoint( rCenter, sal_True );
ImplGetPoint( aPoint1, sal_True );
ImplGetPoint( aPoint2, sal_True );
ImplGetPoint( rCenter, true );
ImplGetPoint( aPoint1, true );
ImplGetPoint( aPoint2, true );
fRot1 = ImplGetOrientation( rCenter, aPoint1 );
fRot2 = ImplGetOrientation( rCenter, aPoint2 );
rAngle = ImplGetOrientation( rCenter, aPoint1 );
@@ -95,14 +95,14 @@ sal_Bool CGM::ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double&
if ( fRot1 > fRot2 )
{
if ( ( fRot1 - fRot2 ) < 180 )
return sal_False;
return false;
}
else
{
if ( ( fRot2 - fRot1 ) > 180 )
return sal_False;
return false;
}
return sal_True;
return true;
}
void CGM::ImplDoClass4()
@@ -130,7 +130,7 @@ void CGM::ImplDoClass4()
for ( sal_uInt16 i = 0; i < nPoints; i++)
{
FloatPoint aFloatPoint;
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), i );
}
if ( mbFigure )
@@ -153,7 +153,7 @@ void CGM::ImplDoClass4()
Polygon aPolygon( nPoints );
for ( sal_uInt16 i = 0; i < nPoints; i++ )
{
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), 0 );
}
mpOutAct->RegPolyLine( aPolygon );
@@ -164,9 +164,9 @@ void CGM::ImplDoClass4()
Polygon aPolygon( (sal_uInt16)2 );
for ( sal_uInt16 i = 0; i < nPoints; i++ )
{
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), 0 );
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), 1);
mpOutAct->DrawPolyLine( aPolygon );
}
@@ -185,7 +185,7 @@ void CGM::ImplDoClass4()
if ( mbFigure )
mpOutAct->CloseRegion();
ImplGetPoint ( aFloatPoint, sal_True );
ImplGetPoint ( aFloatPoint, true );
nType = ImplGetUI16( 4 );
nSize = ImplGetUI( 1 );
mpSource[ mnParaSize + nSize ] = 0;
@@ -220,7 +220,7 @@ void CGM::ImplDoClass4()
ImplMapDouble( dx );
ImplMapDouble( dy );
ImplGetPoint ( aFloatPoint, sal_True );
ImplGetPoint ( aFloatPoint, true );
nType = ImplGetUI16( 4 );
nSize = ImplGetUI( 1 );
@@ -258,7 +258,7 @@ void CGM::ImplDoClass4()
for ( sal_uInt16 i = 0; i < nPoints; i++)
{
FloatPoint aFloatPoint;
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
aPolygon.SetPoint( Point ( (long)( aFloatPoint.X ), (long)( aFloatPoint.Y ) ), i );
}
mpOutAct->DrawPolygon( aPolygon );
@@ -278,7 +278,7 @@ void CGM::ImplDoClass4()
sal_uInt32 nEdgeFlag;
while ( mnParaSize < mnElementSize )
{
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
nEdgeFlag = ImplGetUI16();
pPoints[ nPoints++ ] = Point( (long)aFloatPoint.X, (long)aFloatPoint.Y );
if ( ( nEdgeFlag & 2 ) || ( mnParaSize == mnElementSize ) )
@@ -332,7 +332,7 @@ void CGM::ImplDoClass4()
mpOutAct->CloseRegion();
FloatRect aFloatRect;
ImplGetRectangle( aFloatRect, sal_True );
ImplGetRectangle( aFloatRect, true );
mpOutAct->DrawRectangle( aFloatRect );
}
break;
@@ -344,7 +344,7 @@ void CGM::ImplDoClass4()
double fRotation = 0;
FloatPoint aCenter, aRadius;
ImplGetPoint( aCenter, sal_True );
ImplGetPoint( aCenter, true );
if ( pElement->eVDCType == VDC_REAL )
aRadius.X = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
else
@@ -358,9 +358,9 @@ void CGM::ImplDoClass4()
case 0x0d : /*Circular Arc 3 Point*/
{
FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint, aCenterPoint;
ImplGetPoint( aStartingPoint, sal_True );
ImplGetPoint( aIntermediatePoint, sal_True );
ImplGetPoint( aEndingPoint, sal_True );
ImplGetPoint( aStartingPoint, true );
ImplGetPoint( aIntermediatePoint, true );
ImplGetPoint( aEndingPoint, true );
double fA = aIntermediatePoint.X - aStartingPoint.X;
double fB = aIntermediatePoint.Y - aStartingPoint.Y;
@@ -410,7 +410,7 @@ void CGM::ImplDoClass4()
Size( ( static_cast< long >( 2 * fRadius ) ), (long)( 2 * fRadius) ) );
Polygon aPolygon( aBoundingBox, Point( (long)aStartingPoint.X, (long)aStartingPoint.Y ) ,Point( (long)aEndingPoint.X, (long)aEndingPoint.Y ), POLY_ARC );
if ( nSwitch )
mpOutAct->RegPolyLine( aPolygon, sal_True );
mpOutAct->RegPolyLine( aPolygon, true );
else
mpOutAct->RegPolyLine( aPolygon );
}
@@ -494,7 +494,7 @@ void CGM::ImplDoClass4()
if ( mbFigure )
mpOutAct->CloseRegion();
ImplGetPoint( aCenter, sal_True );
ImplGetPoint( aCenter, true );
ImplGetVector( &vector[ 0 ] );
if ( pElement->eVDCType == VDC_REAL )
@@ -548,7 +548,7 @@ void CGM::ImplDoClass4()
if ( mbFigure )
mpOutAct->CloseRegion();
ImplGetPoint( aCenter, sal_True );
ImplGetPoint( aCenter, true );
ImplGetVector( &vector[ 0 ] );
if ( pElement->eVDCType == VDC_REAL )
{
@@ -609,7 +609,7 @@ void CGM::ImplDoClass4()
if ( mbFigure )
mpOutAct->CloseRegion();
sal_Bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
ImplGetVector( &vector[ 0 ] );
fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
@@ -637,7 +637,7 @@ void CGM::ImplDoClass4()
if ( mbFigure )
mpOutAct->CloseRegion();
sal_Bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
ImplGetVector( &vector[ 0 ] );
fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
@@ -709,7 +709,7 @@ void CGM::ImplDoClass4()
for ( sal_uInt16 i = 0; i < nNumberOfPoints; i++)
{
FloatPoint aFloatPoint;
ImplGetPoint( aFloatPoint, sal_True );
ImplGetPoint( aFloatPoint, true );
aPolygon.SetPoint( Point ( (long)( aFloatPoint.X ), (long)( aFloatPoint.Y ) ), i );
}
if ( nOrder & 4 )
diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx
index 43705f4..962f355 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -192,7 +192,7 @@ void CGM::ImplDoClass5()
case 1 : pElement->eTextPath = TPR_LEFT; break;
case 2 : pElement->eTextPath = TPR_UP; break;
case 3 : pElement->eTextPath = TPR_DOWN; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
break;
@@ -289,7 +289,7 @@ void CGM::ImplDoClass5()
{
case 0 : pElement->eEdgeVisibility = EV_OFF; break;
case 1 : pElement->eEdgeVisibility = EV_ON; break;
default : mbStatus = sal_False;
default : mbStatus = false;
}
}
break;
@@ -304,7 +304,7 @@ void CGM::ImplDoClass5()
if ( ( nColorStartIndex > 255 ) ||
( ( ( mnElementSize - pElement->nColorIndexPrecision ) % ( pElement->nColorPrecision * 3 ) ) != 0 ) )
{
mbStatus = sal_False;
mbStatus = false;
}
else
{
@@ -315,7 +315,7 @@ void CGM::ImplDoClass5()
sal_uInt32 nIndex;
if ( nMaxColorIndex > 255 )
{
mbStatus = sal_False;
mbStatus = false;
break;
}
if ( pElement->nLatestColorMaximumIndex < nMaxColorIndex )
@@ -323,7 +323,7 @@ void CGM::ImplDoClass5()
for ( nIndex = nColorStartIndex; nIndex <= nMaxColorIndex; nIndex++ )
{
pElement->aLatestColorTable[ nIndex ] = ImplGetBitmapColor( sal_True );
pElement->aLatestColorTable[ nIndex ] = ImplGetBitmapColor( true );
}
pElement->nColorMaximumIndex = pElement->nLatestColorMaximumIndex;
@@ -366,14 +366,14 @@ void CGM::ImplDoClass5()
case 16 : nFlag = ASF_CHARACTEREXPANSION; break;
case 17 : nFlag = ASF_CHARACTERSPACING; break;
case 18 : nFlag = ASF_TEXTCOLOR; break;
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
sal_uInt32 nASF = ImplGetUI16();
switch ( nASF )
{
case 0 : pElement->nAspectSourceFlags &= ~nFlag; break; // INDIVIDUAL
case 1 : pElement->nAspectSourceFlags |= nFlag; break; // BUNDLED
default : mbStatus = sal_False; break;
default : mbStatus = false; break;
}
}
}
diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx
index 8d8c038..7b65732 100644
--- a/filter/source/graphicfilter/icgm/classx.cxx
+++ b/filter/source/graphicfilter/icgm/classx.cxx
@@ -135,12 +135,12 @@ void CGM::ImplDoClass6()
case -32761 : /*end figure*/
{
mpOutAct->EndFigure();
mbFigure = sal_False;
mbFigure = false;
}
break;
case -32762 : /*begin figure*/
{
mbFigure = sal_True;
mbFigure = true;
mpOutAct->BeginFigure();
}
break;
diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx
index 6b2bc38..f4c10dc 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -280,7 +280,7 @@ void CGMElements::Init()
nBackGroundColor = nAuxiliaryColor = 0;
bSegmentCount = sal_False;
bSegmentCount = false;
nScalingFactor = 1.0;
nTextAlignmentVCont = nTextAlignmentHCont = 0.0;
diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx
index 6a215ef..7511785 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.hxx
@@ -125,7 +125,7 @@ class CGMElements
// Delimiter Counts -> which will be increased by each 'begin' operation
// and decreased by each 'end' operation
sal_Bool bSegmentCount;
bool bSegmentCount;
CGMElements( CGM& rCGM );
~CGMElements();
CGMElements& operator=( CGMElements& );
diff --git a/filter/source/graphicfilter/icgm/outact.cxx b/filter/source/graphicfilter/icgm/outact.cxx
index 798b2f2..f7394df 100644
--- a/filter/source/graphicfilter/icgm/outact.cxx
+++ b/filter/source/graphicfilter/icgm/outact.cxx
@@ -98,7 +98,7 @@ void CGMOutAct::EndFigure()
void CGMOutAct::RegPolyLine( Polygon& rPolygon, sal_Bool bReverse )
void CGMOutAct::RegPolyLine( Polygon& rPolygon, bool bReverse )
{
sal_uInt16 nPoints = rPolygon.GetSize();
if ( nPoints )
diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx
index 99b8dd5..7e5fd3a 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -63,7 +63,7 @@ class CGMOutAct
public:
CGMOutAct( CGM& rCGM );
virtual ~CGMOutAct();
virtual void FirstOutPut() { mpCGM->mbFirstOutPut = sal_False; } ;
virtual void FirstOutPut() { mpCGM->mbFirstOutPut = false; } ;
virtual void InsertPage() { mnCurrentPage++; } ;
virtual void BeginGroup() {} ;
virtual void EndGroup() {};
@@ -72,7 +72,7 @@ class CGMOutAct
void CloseRegion() ;
void NewRegion() ;
void EndFigure() ;
void RegPolyLine( Polygon&, sal_Bool bReverse = sal_False ) ;
void RegPolyLine( Polygon&, bool bReverse = false ) ;
void SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 nType );
void SetGradientAngle( long nAngle );
void SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorTo );
@@ -99,14 +99,14 @@ class CGMImpressOutAct : public CGMOutAct
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > maXMultiServiceFactory;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > maXShape;
sal_Bool ImplCreateShape( const OUString& rType );
bool ImplCreateShape( const OUString& rType );
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > maXPropSet;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > maXShapes;
sal_uInt32 nFinalTextCount;
sal_Bool ImplInitPage();
bool ImplInitPage();
void ImplSetOrientation( FloatPoint& RefPoint, double& Orientation ) ;
void ImplSetLineBundle() ;
void ImplSetFillBundle() ;
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 31f33fb..5cf89f4 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -146,13 +146,13 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE)
}
sal_Bool DXF2GDIMetaFile::SetLineAttribute(const DXFBasicEntity & rE, sal_uLong /*nWidth*/)
bool DXF2GDIMetaFile::SetLineAttribute(const DXFBasicEntity & rE, sal_uLong /*nWidth*/)
{
long nColor;
Color aColor;
nColor=GetEntityColor(rE);
if (nColor<0) return sal_False;
if (nColor<0) return false;
aColor=ConvertColor((sal_uInt8)nColor);
if (aActLineColor!=aColor) {
@@ -162,17 +162,17 @@ sal_Bool DXF2GDIMetaFile::SetLineAttribute(const DXFBasicEntity & rE, sal_uLong
if (aActFillColor!=Color( COL_TRANSPARENT )) {
pVirDev->SetFillColor(aActFillColor = Color( COL_TRANSPARENT ));
}
return sal_True;
return true;
}
sal_Bool DXF2GDIMetaFile::SetAreaAttribute(const DXFBasicEntity & rE)
bool DXF2GDIMetaFile::SetAreaAttribute(const DXFBasicEntity & rE)
{
long nColor;
Color aColor;
nColor=GetEntityColor(rE);
if (nColor<0) return sal_False;
if (nColor<0) return false;
aColor=ConvertColor((sal_uInt8)nColor);
if (aActLineColor!=aColor) {
@@ -182,11 +182,11 @@ sal_Bool DXF2GDIMetaFile::SetAreaAttribute(const DXFBasicEntity & rE)
if ( aActFillColor == Color( COL_TRANSPARENT ) || aActFillColor != aColor) {
pVirDev->SetFillColor( aActFillColor = aColor );
}
return sal_True;
return true;
}
sal_Bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAngle, sal_uInt16 nHeight, double /*fWidthScale*/)
bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAngle, sal_uInt16 nHeight, double /*fWidthScale*/)
{
long nColor;
Color aColor;
@@ -197,7 +197,7 @@ sal_Bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAng
while (nAngle<0) nAngle+=3600;
nColor=GetEntityColor(rE);
if (nColor<0) return sal_False;
if (nColor<0) return false;
aColor=ConvertColor((sal_uInt8)nColor);
aFont.SetColor(aColor);
@@ -211,7 +211,7 @@ sal_Bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAng
pVirDev->SetFont(aActFont);
}
return sal_True;
return true;
}
@@ -262,9 +262,9 @@ void DXF2GDIMetaFile::DrawCircleEntity(const DXFCircleEntity & rE, const DXFTran
sal_uInt16 nPoints,i;
DXFVector aC;
if (SetLineAttribute(rE)==sal_False) return;
if (SetLineAttribute(rE)==false) return;
rTransform.Transform(rE.aP0,aC);
if (rE.fThickness==0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)==sal_True) {
if (rE.fThickness==0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)) {
pVirDev->DrawEllipse(
Rectangle((long)(aC.fx-frx+0.5),(long)(aC.fy-fry+0.5),
(long)(aC.fx+frx+0.5),(long)(aC.fy+fry+0.5)));
@@ -305,20 +305,20 @@ void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity & rE, const DXFTransform
DXFVector aC;
Point aPS,aPE;
if (SetLineAttribute(rE)==sal_False) return;
if (SetLineAttribute(rE)==false) return;
fA1=rE.fStart;
fdA=rE.fEnd-fA1;
while (fdA>=360.0) fdA-=360.0;
while (fdA<=0) fdA+=360.0;
rTransform.Transform(rE.aP0,aC);
if (rE.fThickness==0 && fdA>5.0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)==sal_True) {
if (rE.fThickness==0 && fdA>5.0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)) {
DXFVector aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
aVS*=rE.fRadius;
aVS+=rE.aP0;
DXFVector aVE(cos((fA1+fdA)/180.0*3.14159265359),sin((fA1+fdA)/180.0*3.14159265359),0.0);
aVE*=rE.fRadius;
aVE+=rE.aP0;
if (rTransform.Mirror()==sal_True) {
if (rTransform.Mirror()) {
rTransform.Transform(aVS,aPS);
rTransform.Transform(aVE,aPE);
}
@@ -689,7 +689,7 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
const DXFBasicEntity * pE=rEntities.pFirst;
while (pE!=NULL && bStatus==sal_True) {
while (pE!=NULL && bStatus) {
if (pE->nSpace==0) {
if (pE->aExtrusion.fz==1.0) {
pT=&rTransform;
@@ -771,7 +771,7 @@ DXF2GDIMetaFile::~DXF2GDIMetaFile()
}
sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF, sal_uInt16 nminpercent, sal_uInt16 nmaxpercent)
bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF, sal_uInt16 nminpercent, sal_uInt16 nmaxpercent)
{
double fWidth,fHeight,fScale;
DXFTransform aTransform;
@@ -781,7 +781,7 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
pVirDev = new VirtualDevice;
pDXF = &rDXF;
bStatus = sal_True;
bStatus = true;
OptPointsPerCircle=50;
@@ -829,13 +829,13 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
}
if (pVPort==NULL) {
if (pDXF->aBoundingBox.bEmpty==sal_True)
bStatus=sal_False;
if (pDXF->aBoundingBox.bEmpty)
bStatus=false;
else {
fWidth=pDXF->aBoundingBox.fMaxX-pDXF->aBoundingBox.fMinX;
fHeight=pDXF->aBoundingBox.fMaxY-pDXF->aBoundingBox.fMinY;
if (fWidth<=0 || fHeight<=0) {
bStatus=sal_False;
bStatus=false;
fScale = 0; // -Wall added this...
}
else {
@@ -870,12 +870,12 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
aPrefSize.Height()=(long)(fHeight*fScale+1.5);
}
if (bStatus==sal_True)
if (bStatus)
DrawEntities(pDXF->aEntities,aTransform);
rMTF.Stop();
if ( bStatus==sal_True )
if ( bStatus )
{
rMTF.SetPrefSize( aPrefSize );
// simply set map mode to 1/100-mm (1/10-mm) if the graphic
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index 20222ad..7d7dca3 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -36,7 +36,7 @@ private:
VirtualDevice * pVirDev;
const DXFRepresentation * pDXF;
sal_Bool bStatus;
bool bStatus;
sal_uInt16 OptPointsPerCircle;
@@ -63,11 +63,11 @@ private:
DXFLineInfo GetEntityDXFLineInfo(const DXFBasicEntity & rE);
sal_Bool SetLineAttribute(const DXFBasicEntity & rE, sal_uLong nWidth=0);
bool SetLineAttribute(const DXFBasicEntity & rE, sal_uLong nWidth=0);
sal_Bool SetAreaAttribute(const DXFBasicEntity & rE);
bool SetAreaAttribute(const DXFBasicEntity & rE);
sal_Bool SetFontAttribute(const DXFBasicEntity & rE, short nAngle,
bool SetFontAttribute(const DXFBasicEntity & rE, short nAngle,
sal_uInt16 nHeight, double fWidthScale);
void DrawLineEntity(const DXFLineEntity & rE, const DXFTransform & rTransform);
@@ -106,7 +106,7 @@ public:
DXF2GDIMetaFile();
~DXF2GDIMetaFile();
sal_Bool Convert( const DXFRepresentation & rDXF, GDIMetaFile & rMTF, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent);
bool Convert( const DXFRepresentation & rDXF, GDIMetaFile & rMTF, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent);
};
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index c5c1306..8bb1dce 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -462,16 +462,16 @@ DXFEdgeTypeLine::~DXFEdgeTypeLine()
{
}
sal_Bool DXFEdgeTypeLine::EvaluateGroup( DXFGroupReader & rDGR )
bool DXFEdgeTypeLine::EvaluateGroup( DXFGroupReader & rDGR )
{
sal_Bool bExecutingGroupCode = sal_True;
bool bExecutingGroupCode = true;
switch ( rDGR.GetG() )
{
case 10 : aStartPoint.fx = rDGR.GetF(); break;
case 20 : aStartPoint.fy = rDGR.GetF(); break;
case 11 : aEndPoint.fx = rDGR.GetF(); break;
case 21 : aEndPoint.fy = rDGR.GetF(); break;
default : bExecutingGroupCode = sal_False; break;
default : bExecutingGroupCode = false; break;
}
return bExecutingGroupCode;
}
@@ -487,9 +487,9 @@ DXFEdgeTypeCircularArc::DXFEdgeTypeCircularArc() :
DXFEdgeTypeCircularArc::~DXFEdgeTypeCircularArc()
{
}
sal_Bool DXFEdgeTypeCircularArc::EvaluateGroup( DXFGroupReader & rDGR )
bool DXFEdgeTypeCircularArc::EvaluateGroup( DXFGroupReader & rDGR )
{
sal_Bool bExecutingGroupCode = sal_True;
bool bExecutingGroupCode = true;
switch ( rDGR.GetG() )
{
case 10 : aCenter.fx = rDGR.GetF(); break;
@@ -498,7 +498,7 @@ sal_Bool DXFEdgeTypeCircularArc::EvaluateGroup( DXFGroupReader & rDGR )
case 50 : fStartAngle = rDGR.GetF(); break;
case 51 : fEndAngle = rDGR.GetF(); break;
case 73 : nIsCounterClockwiseFlag = rDGR.GetI(); break;
default : bExecutingGroupCode = sal_False; break;
default : bExecutingGroupCode = false; break;
}
return bExecutingGroupCode;
}
@@ -515,9 +515,9 @@ DXFEdgeTypeEllipticalArc::~DXFEdgeTypeEllipticalArc()
{
}
sal_Bool DXFEdgeTypeEllipticalArc::EvaluateGroup( DXFGroupReader & rDGR )
bool DXFEdgeTypeEllipticalArc::EvaluateGroup( DXFGroupReader & rDGR )
{
sal_Bool bExecutingGroupCode = sal_True;
bool bExecutingGroupCode = true;
switch( rDGR.GetG() )
{
case 10 : aCenter.fx = rDGR.GetF(); break;
@@ -528,7 +528,7 @@ sal_Bool DXFEdgeTypeEllipticalArc::EvaluateGroup( DXFGroupReader & rDGR )
case 50 : fStartAngle = rDGR.GetF(); break;
case 51 : fEndAngle = rDGR.GetF(); break;
case 73 : nIsCounterClockwiseFlag = rDGR.GetI(); break;
default : bExecutingGroupCode = sal_False; break;
default : bExecutingGroupCode = false; break;
}
return bExecutingGroupCode;
}
@@ -546,9 +546,9 @@ DXFEdgeTypeSpline::~DXFEdgeTypeSpline()
{
}
sal_Bool DXFEdgeTypeSpline::EvaluateGroup( DXFGroupReader & rDGR )
bool DXFEdgeTypeSpline::EvaluateGroup( DXFGroupReader & rDGR )
{
sal_Bool bExecutingGroupCode = sal_True;
bool bExecutingGroupCode = true;
switch ( rDGR.GetG() )
{
case 94 : nDegree = rDGR.GetI(); break;
@@ -556,7 +556,7 @@ sal_Bool DXFEdgeTypeSpline::EvaluateGroup( DXFGroupReader & rDGR )
case 74 : nPeriodic = rDGR.GetI(); break;
case 95 : nKnotCount = rDGR.GetI(); break;
case 96 : nControlCount = rDGR.GetI(); break;
default : bExecutingGroupCode = sal_False; break;
default : bExecutingGroupCode = false; break;
}
return bExecutingGroupCode;
}
@@ -569,7 +569,7 @@ DXFBoundaryPathData::DXFBoundaryPathData() :
fBulge( 0.0 ),
nSourceBoundaryObjects( 0 ),
nEdgeCount( 0 ),
bIsPolyLine( sal_True ),
bIsPolyLine( true ),
nPointIndex( 0 ),
pP( NULL )
{
@@ -583,9 +583,9 @@ DXFBoundaryPathData::~DXFBoundaryPathData()
delete[] pP;
}
sal_Bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
{
sal_Bool bExecutingGroupCode = sal_True;
bool bExecutingGroupCode = true;
if ( bIsPolyLine )
{
switch( rDGR.GetG() )
@@ -594,7 +594,7 @@ sal_Bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
{
nFlags = rDGR.GetI();
if ( ( nFlags & 2 ) == 0 )
bIsPolyLine = sal_False;
bIsPolyLine = false;
}
break;
case 93 :
@@ -621,7 +621,7 @@ sal_Bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
}
break;
default : bExecutingGroupCode = sal_False; break;
default : bExecutingGroupCode = false; break;
}
}
else
@@ -642,14 +642,14 @@ sal_Bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
else if ( aEdges.size() )
aEdges[ aEdges.size() - 1 ]->EvaluateGroup( rDGR );
else
bExecutingGroupCode = sal_False;
bExecutingGroupCode = false;
}
return bExecutingGroupCode;
}
DXFHatchEntity::DXFHatchEntity() :
DXFBasicEntity( DXF_HATCH ),
bIsInBoundaryPathContext( sal_False ),
bIsInBoundaryPathContext( false ),
nCurrentBoundaryPathIndex( -1 ),
nFlags( 0 ),
nAssociativityFlag( 0 ),
@@ -677,7 +677,7 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR )
case 71 : nAssociativityFlag = rDGR.GetI(); break;
case 91 :
{
bIsInBoundaryPathContext = sal_True;
bIsInBoundaryPathContext = true;
nBoundaryPathCount = rDGR.GetI();
if ( nBoundaryPathCount )
pBoundaryPathData = new DXFBoundaryPathData[ nBoundaryPathCount ];
@@ -686,7 +686,7 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR )
case 75 :
{
nHatchStyle = rDGR.GetI();
bIsInBoundaryPathContext = sal_False;
bIsInBoundaryPathContext = false;
}
break;
case 76 : nHatchPatternType = rDGR.GetI(); break;
@@ -702,14 +702,14 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR )
//fallthrough
default:
{
sal_Bool bExecutingGroupCode = sal_False;
bool bExecutingGroupCode = false;
if ( bIsInBoundaryPathContext )
{
if ( ( nCurrentBoundaryPathIndex >= 0 ) &&
( nCurrentBoundaryPathIndex < nBoundaryPathCount ) )
bExecutingGroupCode = pBoundaryPathData[ nCurrentBoundaryPathIndex ].EvaluateGroup( rDGR );
}
if ( bExecutingGroupCode == sal_False )
if ( bExecutingGroupCode == false )
DXFBasicEntity::EvaluateGroup(rDGR);
}
break;
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index 8c6f950..57cd399 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -382,7 +382,7 @@ struct DXFEdgeType
sal_Int32 nEdgeType;
virtual ~DXFEdgeType(){};
virtual sal_Bool EvaluateGroup( DXFGroupReader & /*rDGR*/ ){ return sal_True; };
virtual bool EvaluateGroup( DXFGroupReader & /*rDGR*/ ){ return true; };
protected :
@@ -394,7 +394,7 @@ struct DXFEdgeTypeLine : public DXFEdgeType
DXFVector aEndPoint; // 11,21
DXFEdgeTypeLine();
virtual ~DXFEdgeTypeLine();
virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
};
struct DXFEdgeTypeCircularArc : public DXFEdgeType
{
@@ -405,7 +405,7 @@ struct DXFEdgeTypeCircularArc : public DXFEdgeType
sal_Int32 nIsCounterClockwiseFlag; // 73
DXFEdgeTypeCircularArc();
virtual ~DXFEdgeTypeCircularArc();
virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
};
struct DXFEdgeTypeEllipticalArc : public DXFEdgeType
{
@@ -418,7 +418,7 @@ struct DXFEdgeTypeEllipticalArc : public DXFEdgeType
DXFEdgeTypeEllipticalArc();
virtual ~DXFEdgeTypeEllipticalArc();
virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
};
struct DXFEdgeTypeSpline : public DXFEdgeType
{
@@ -430,7 +430,7 @@ struct DXFEdgeTypeSpline : public DXFEdgeType
DXFEdgeTypeSpline();
virtual ~DXFEdgeTypeSpline();
virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
};
typedef std::deque< DXFEdgeType* > DXFEdgeTypeArray;
@@ -445,7 +445,7 @@ struct DXFBoundaryPathData
sal_Int32 nSourceBoundaryObjects; // 97
sal_Int32 nEdgeCount; // 93
sal_Bool bIsPolyLine;
bool bIsPolyLine;
sal_Int32 nPointIndex;
DXFVector* pP;
@@ -454,12 +454,12 @@ struct DXFBoundaryPathData
DXFBoundaryPathData();
~DXFBoundaryPathData();
sal_Bool EvaluateGroup( DXFGroupReader & rDGR );
bool EvaluateGroup( DXFGroupReader & rDGR );
};
class DXFHatchEntity : public DXFBasicEntity
{
sal_Bool bIsInBoundaryPathContext;
bool bIsInBoundaryPathContext;
sal_Int32 nCurrentBoundaryPathIndex;
public :
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index 506ffa2..0d79682 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -33,7 +33,7 @@
OString DXFReadLine(SvStream& rIStm)
{
char buf[256 + 1];
sal_Bool bEnd = sal_False;
bool bEnd = false;
sal_uLong nOldFilePos = rIStm.Tell();
char c = 0;
@@ -62,14 +62,14 @@ OString DXFReadLine(SvStream& rIStm)
}
else
{
bEnd = sal_True;
bEnd = true;
break;
}
}
}
if( !bEnd && !rIStm.GetError() && !aBuf.isEmpty() )
bEnd = sal_True;
bEnd = true;
nOldFilePos += aBuf.getLength();
if( rIStm.Tell() > nOldFilePos )
@@ -96,7 +96,7 @@ DXFGroupReader::DXFGroupReader(SvStream & rIStream, sal_uInt16 nminpercent, sal_
nIBuffPos=0;
nIBuffSize=0;
bStatus=sal_True;
bStatus=true;
nLastG=0;
nGCount=0;
@@ -154,7 +154,7 @@ sal_uInt16 DXFGroupReader::Read()
else if (nG<1010) ReadS(S999_1009[nG-999]);
else if (nG<1060) F1010_1059[nG-1010]=ReadF();
else if (nG<1080) I1060_1079[nG-1060]=ReadI();
else bStatus = sal_False;
else bStatus = false;
}
}
if ( bStatus )
@@ -273,7 +273,7 @@ long DXFGroupReader::ReadI()
while(*p==0x20) p++;
if ((*p<'0' || *p>'9') && *p!='-') {
bStatus=sal_False;
bStatus=false;
return 0;
}
@@ -291,7 +291,7 @@ long DXFGroupReader::ReadI()
while (*p==0x20) p++;
if (*p!=0) {
bStatus=sal_False;
bStatus=false;
return 0;
}
@@ -307,7 +307,7 @@ double DXFGroupReader::ReadF()
p=sl;
while(*p==0x20) p++;
if ((*p<'0' || *p>'9') && *p!='.' && *p!='-') {
bStatus=sal_False;
bStatus=false;
return 0.0;
}
return atof(p);
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index 6864e99..d1fb880 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -37,7 +37,7 @@ public:
DXFGroupReader( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent );
sal_Bool GetStatus() const;
bool GetStatus() const;
void SetError();
@@ -88,7 +88,7 @@ private:
SvStream & rIS;
sal_uInt16 nIBuffSize,nIBuffPos;
sal_Bool bStatus;
bool bStatus;
sal_uInt16 nLastG;
sal_uLong nGCount;
@@ -113,7 +113,7 @@ private:
};
inline sal_Bool DXFGroupReader::GetStatus() const
inline bool DXFGroupReader::GetStatus() const
{
return bStatus;
}
@@ -121,7 +121,7 @@ inline sal_Bool DXFGroupReader::GetStatus() const
inline void DXFGroupReader::SetError()
{
bStatus=sal_False;
bStatus=false;
}
inline sal_uInt16 DXFGroupReader::GetG() const
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 47cd94a..456d3b2 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -27,14 +27,14 @@
void DXFBoundingBox::Union(const DXFVector & rVector)
{
if (bEmpty==sal_True) {
if (bEmpty) {
fMinX=rVector.fx;
fMinY=rVector.fy;
fMinZ=rVector.fz;
fMaxX=rVector.fx;
fMaxY=rVector.fy;
fMaxZ=rVector.fz;
bEmpty=sal_False;
bEmpty=false;
}
else {
if (fMinX>rVector.fx) fMinX=rVector.fx;
@@ -139,9 +139,9 @@ DXFRepresentation::~DXFRepresentation()
}
sal_Bool DXFRepresentation::Read( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent)
bool DXFRepresentation::Read( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent)
{
sal_Bool bRes;
bool bRes;
aTables.Clear();
aBlocks.Clear();
@@ -169,7 +169,7 @@ sal_Bool DXFRepresentation::Read( SvStream & rIStream, sal_uInt16 nMinPercent, s
pDGR.reset();
if (bRes==sal_True && aBoundingBox.bEmpty==sal_True)
if (bRes && aBoundingBox.bEmpty)
CalcBoundingBox(aEntities,aBoundingBox);
return bRes;
@@ -301,7 +301,7 @@ void DXFRepresentation::CalcBoundingBox(const DXFEntities & rEntities,
pB=aBlocks.Search(pE->m_sName);
if (pB==NULL) break;
CalcBoundingBox(*pB,aBox);
if (aBox.bEmpty==sal_True) break;
if (aBox.bEmpty) break;
aP.fx=(aBox.fMinX-pB->aBasePoint.fx)*pE->fXScale+pE->aP0.fx;
aP.fy=(aBox.fMinY-pB->aBasePoint.fy)*pE->fYScale+pE->aP0.fy;
aP.fz=(aBox.fMinZ-pB->aBasePoint.fz)*pE->fZScale+pE->aP0.fz;
@@ -343,7 +343,7 @@ void DXFRepresentation::CalcBoundingBox(const DXFEntities & rEntities,
pB = aBlocks.Search(pE->m_sPseudoBlock);
if (pB==NULL) break;
CalcBoundingBox(*pB,aBox);
if (aBox.bEmpty==sal_True) break;
if (aBox.bEmpty) break;
aP.fx=aBox.fMinX-pB->aBasePoint.fx;
aP.fy=aBox.fMinY-pB->aBasePoint.fy;
aP.fz=aBox.fMinZ-pB->aBasePoint.fz;
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx
index 27985c9..6a43ddd 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx
@@ -32,7 +32,7 @@
class DXFBoundingBox {
public:
sal_Bool bEmpty;
bool bEmpty;
double fMinX;
double fMinY;
double fMinZ;
@@ -40,7 +40,7 @@ public:
double fMaxY;
double fMaxZ;
DXFBoundingBox():bEmpty(sal_True), fMinX(0.0), fMinY(0.0), fMinZ(0.0), fMaxX(0.0), fMaxY(0.0), fMaxZ(0.0) {}
DXFBoundingBox():bEmpty(true), fMinX(0.0), fMinY(0.0), fMinZ(0.0), fMaxX(0.0), fMaxY(0.0), fMaxZ(0.0) {}
void Union(const DXFVector & rVector);
};
@@ -103,7 +103,7 @@ public:
double getGlobalLineTypeScale() const;
void setGlobalLineTypeScale(double fGlobalLineTypeScale);
sal_Bool Read( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent);
bool Read( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent);
// Reads complete DXF file.
private:
diff --git a/filter/source/graphicfilter/idxf/dxfvec.cxx b/filter/source/graphicfilter/idxf/dxfvec.cxx
index 415bbc4..7ee4b69 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.cxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.cxx
@@ -165,7 +165,7 @@ void DXFTransform::TransDir(const DXFVector & rSrc, DXFVector & rTgt) const
}
sal_Bool DXFTransform::TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const
bool DXFTransform::TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const
{
double fMXAbs=aMX.Abs();
double fMYAbs=aMY.Abs();
@@ -176,22 +176,22 @@ sal_Bool DXFTransform::TransCircleToEllipse(double fRadius, double & rEx, double
{
rEx=fabs(aMX.fx*fRadius);
rEy=fabs(aMY.fy*fRadius);
return sal_True;
return true;
}
else if (fabs(aMX.fx)<=fNearNull && fabs(aMX.fz)<=fNearNull &&
fabs(aMY.fy)<=fNearNull && fabs(aMY.fz)<=fNearNull)
{
rEx=fabs(aMY.fx*fRadius);
rEy=fabs(aMX.fy*fRadius);
return sal_True;
return true;
}
else if (fabs(fMXAbs-fMYAbs)<=fNearNull &&
fabs(aMX.fz)<=fNearNull && fabs(aMY.fz)<=fNearNull)
{
rEx=rEy=fabs(((fMXAbs+fMYAbs)/2)*fRadius);
return sal_True;
return true;
}
else return sal_False;
else return false;
}
LineInfo DXFTransform::Transform(const DXFLineInfo& aDXFLineInfo) const
@@ -238,9 +238,9 @@ double DXFTransform::CalcRotAngle() const
return atan2(aMX.fy,aMX.fx)/3.14159265359*180.0;
}
sal_Bool DXFTransform::Mirror() const
bool DXFTransform::Mirror() const
{
if (aMZ.SProd(aMX*aMY)<0) return sal_True; else return sal_False;
if (aMZ.SProd(aMX*aMY)<0) return true; else return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx
index 8e936f0..ca84a1a 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -93,8 +93,8 @@ public:
DXFVector Unit() const;
// equivalence or net:
sal_Bool operator == (const DXFVector & rV) const;
sal_Bool operator != (const DXFVector & rV) const;
bool operator == (const DXFVector & rV) const;
bool operator != (const DXFVector & rV) const;
};
@@ -142,7 +142,7 @@ public:
void TransDir(const DXFVector & rSrc, DXFVector & rTgt) const;
// Transformation of a relative vector (so no translation)
sal_Bool TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const;
bool TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const;
// Attemp to transform a circle (in xy plane) so that it results
// in an aligned ellipse. If the does not work because a ellipse of
// arbitrary position would be created, sal_False is returned.
@@ -154,7 +154,7 @@ public:
double CalcRotAngle() const;
// Calculates the rotation angle around z-axis (in degrees)
sal_Bool Mirror() const;
bool Mirror() const;
// Returns sal_True, if the matrice represents a left-handed coordinate system
LineInfo Transform(const DXFLineInfo& aDXFLineInfo) const;
@@ -239,17 +239,17 @@ inline DXFVector DXFVector::operator * (double fs) const
}
inline sal_Bool DXFVector::operator == (const DXFVector & rV) const
inline bool DXFVector::operator == (const DXFVector & rV) const
{
if (fx==rV.fx && fy==rV.fy && fz==rV.fz) return sal_True;
else return sal_False;
if (fx==rV.fx && fy==rV.fy && fz==rV.fz) return true;
else return false;
}
inline sal_Bool DXFVector::operator != (const DXFVector & rV) const
inline bool DXFVector::operator != (const DXFVector & rV) const
{
if (fx!=rV.fx || fy!=rV.fy || fz!=rV.fz) return sal_True;
else return sal_False;
if (fx!=rV.fx || fy!=rV.fy || fz!=rV.fz) return true;
else return false;
}
#endif
diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx
index 8ef33f3..5927a56 100644
--- a/filter/source/graphicfilter/idxf/idxf.cxx
+++ b/filter/source/graphicfilter/idxf/idxf.cxx
@@ -43,9 +43,9 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
DXF2GDIMetaFile aConverter;
GDIMetaFile aMTF;
if ( aDXF.Read( rStream, 0, 60 ) == sal_False )
if ( aDXF.Read( rStream, 0, 60 ) == false )
return false;
if ( aConverter.Convert( aDXF, aMTF, 60, 100 ) == sal_False )
if ( aConverter.Convert( aDXF, aMTF, 60, 100 ) == false )
return false;
rGraphic = Graphic(aMTF);
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index dc22abe..1a436cd 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -72,8 +72,8 @@ static sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLo
// SecurityCount is the buffersize of the buffer in which we will parse for a number
static long ImplGetNumber( sal_uInt8 **pBuf, int& nSecurityCount )
{
sal_Bool bValid = sal_True;
sal_Bool bNegative = sal_False;
bool bValid = true;
bool bNegative = false;
long nRetValue = 0;
while ( ( --nSecurityCount ) && ( ( **pBuf == ' ' ) || ( **pBuf == 0x9 ) ) )
(*pBuf)++;
@@ -84,10 +84,10 @@ static long ImplGetNumber( sal_uInt8 **pBuf, int& nSecurityCount )
{
case '.' :
// we'll only use the integer format
bValid = sal_False;
bValid = false;
break;
case '-' :
bNegative = sal_True;
bNegative = true;
break;
default :
if ( ( nByte < '0' ) || ( nByte > '9' ) )
@@ -486,9 +486,9 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
return false;
Graphic aGraphic;
sal_Bool bRetValue = sal_False;
sal_Bool bHasPreview = sal_False;
sal_Bool bGraphicLinkCreated = sal_False;
bool bRetValue = false;
bool bHasPreview = false;
bool bGraphicLinkCreated = false;
sal_uInt32 nSignature, nPSStreamPos, nPSSize;
sal_uInt32 nSizeWMF = 0;
sal_uInt32 nPosWMF = 0;
@@ -510,7 +510,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
rStream.Seek( nOrigPos + nPosWMF );
if ( GraphicConverter::Import( rStream, aGraphic, CVT_WMF ) == ERRCODE_NONE )
bHasPreview = bRetValue = sal_True;
bHasPreview = bRetValue = true;
}
}
else
@@ -526,7 +526,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
MakeAsMeta(aGraphic);
rStream.Seek( nOrigPos + nPosTIFF );
bHasPreview = bRetValue = sal_True;
bHasPreview = bRetValue = true;
}
}
}
@@ -571,7 +571,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
if ( pAcc )
{
int nBitsLeft;
sal_Bool bIsValid = sal_True;
bool bIsValid = true;
sal_uInt8 nDat = 0;
char nByte;
for ( long y = 0; bIsValid && ( y < nHeight ); y++ )
@@ -588,7 +588,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
case 0x0a :
if ( --nScanLines < 0 )
bIsValid = sal_False;
bIsValid = false;
case 0x09 :
case 0x0d :
case 0x20 :
@@ -603,7 +603,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
nByte &=~0x20; // case none sensitive for hexadecimal values
nByte -= ( 'A' - 10 );
if ( nByte > 15 )
bIsValid = sal_False;
bIsValid = false;
}
else
nByte -= '0';
@@ -612,7 +612,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
nDat |= ( nByte ^ 0xf ); // in epsi a zero bit represents white color
}
else
bIsValid = sal_False;
bIsValid = false;
}
break;
}
@@ -645,7 +645,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
aMtf.SetPrefMapMode( MAP_100TH_MM );
aMtf.SetPrefSize( aSize );
aGraphic = aMtf;
bHasPreview = bRetValue = sal_True;
bHasPreview = bRetValue = true;
}
aBitmap.ReleaseAccess( pAcc );
}
@@ -666,7 +666,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
}
if ( nSecurityCount)
{
bGraphicLinkCreated = sal_True;
bGraphicLinkCreated = true;
GfxLink aGfxLink( pBuf, nPSSize, GFX_LINK_TYPE_EPS_BUFFER, true ) ;
GDIMetaFile aMtf;
@@ -695,7 +695,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
aMtf.SetPrefMapMode( MAP_POINT );
aMtf.SetPrefSize( Size( nWidth, nHeight ) );
rGraphic = aMtf;
bRetValue = sal_True;
bRetValue = true;
}
}
}
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 547a771..fff7578 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -214,12 +214,12 @@ struct OSArea {
OSArea * pSucc;
sal_uInt8 nFlags;
PolyPolygon aPPoly;
sal_Bool bClosed;
bool bClosed;
Color aCol;
Color aBgCol;
RasterOp eMix;
RasterOp eBgMix;
sal_Bool bFill;
bool bFill;
};
struct OSPath
@@ -227,8 +227,8 @@ struct OSPath
OSPath* pSucc;
sal_uInt32 nID;
PolyPolygon aPPoly;
sal_Bool bClosed;
sal_Bool bStroke;
bool bClosed;
bool bStroke;
};
struct OSFont {
@@ -296,7 +296,7 @@ struct OSAttr {
// //... aModTransform;
// Point aPatRef;
// sal_uInt8 nPatSet;
sal_Bool bFill;
bool bFill;
// sal_uLong nPickId;
// //... aSegBound;
sal_uInt16 nStrLinWidth;
@@ -320,7 +320,7 @@ private:
Rectangle aBoundingRect; // bounding rectangle as stored in the file
Rectangle aCalcBndRect; // bounding rectangle calculated on our own
MapMode aGlobMapMode; // resolution of the picture
sal_Bool bCoord32;
bool bCoord32;
OSPalette * pPaletteStack;
@@ -341,7 +341,7 @@ private:
SvStream * pOrdFile;
sal_Bool Callback(sal_uInt16 nPercent);
bool Callback(sal_uInt16 nPercent);
void AddPointsToPath(const Polygon & rPoly);
void AddPointsToArea(const Polygon & rPoly);
@@ -349,7 +349,7 @@ private:
void PushAttr(sal_uInt16 nPushOrder);
void PopAttr();
void ChangeBrush( const Color& rPatColor, const Color& rBGColor, sal_Bool bFill );
void ChangeBrush( const Color& rPatColor, const Color& rBGColor, bool bFill );
void SetPen( const Color& rColor, sal_uInt16 nStrLinWidth = 0, PenStyle ePenStyle = PEN_SOLID );
void SetRasterOp(RasterOp eROP);
@@ -360,29 +360,29 @@ private:
Color GetPaletteColor(sal_uInt32 nIndex);
sal_Bool IsLineInfo();
bool IsLineInfo();
void DrawPolyLine( const Polygon& rPolygon );
void DrawPolygon( const Polygon& rPolygon );
void DrawPolyPolygon( const PolyPolygon& rPolygon );
sal_uInt16 ReadBigEndianWord();
sal_uLong ReadBigEndian3BytesLong();
sal_uLong ReadLittleEndian3BytesLong();
long ReadCoord(sal_Bool b32);
Point ReadPoint( const sal_Bool bAdjustBoundRect = sal_True );
long ReadCoord(bool b32);
Point ReadPoint( const bool bAdjustBoundRect = true );
RasterOp OS2MixToRasterOp(sal_uInt8 nMix);
void ReadLine(sal_Bool bGivenPos, sal_uInt16 nOrderLen);
void ReadRelLine(sal_Bool bGivenPos, sal_uInt16 nOrderLen);
void ReadBox(sal_Bool bGivenPos);
void ReadLine(bool bGivenPos, sal_uInt16 nOrderLen);
void ReadRelLine(bool bGivenPos, sal_uInt16 nOrderLen);
void ReadBox(bool bGivenPos);
void ReadBitBlt();
void ReadChrStr(sal_Bool bGivenPos, sal_Bool bMove, sal_Bool bExtra, sal_uInt16 nOrderLen);
void ReadArc(sal_Bool bGivenPos);
void ReadFullArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize);
void ReadPartialArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize);
void ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt16 nOrderLen);
void ReadArc(bool bGivenPos);
void ReadFullArc(bool bGivenPos, sal_uInt16 nOrderSize);
void ReadPartialArc(bool bGivenPos, sal_uInt16 nOrderSize);
void ReadPolygons();
void ReadBezier(sal_Bool bGivenPos, sal_uInt16 nOrderLen);
void ReadFillet(sal_Bool bGivenPos, sal_uInt16 nOrderLen);
void ReadFilletSharp(sal_Bool bGivenPos, sal_uInt16 nOrderLen);
void ReadMarker(sal_Bool bGivenPos, sal_uInt16 nOrderLen);
void ReadBezier(bool bGivenPos, sal_uInt16 nOrderLen);
void ReadFillet(bool bGivenPos, sal_uInt16 nOrderLen);
void ReadFilletSharp(bool bGivenPos, sal_uInt16 nOrderLen);
void ReadMarker(bool bGivenPos, sal_uInt16 nOrderLen);
void ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen);
void ReadDsc(sal_uInt16 nDscID, sal_uInt16 nDscLen);
void ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen);
@@ -401,9 +401,9 @@ public:
//=================== Methods of OS2METReader ==============================
sal_Bool OS2METReader::Callback(sal_uInt16 /*nPercent*/)
bool OS2METReader::Callback(sal_uInt16 /*nPercent*/)
{
return sal_False;
return false;
}
OS2METReader::OS2METReader()
@@ -415,7 +415,7 @@ OS2METReader::OS2METReader()
, aBoundingRect()
, aCalcBndRect()
, aGlobMapMode()
, bCoord32(sal_False)
, bCoord32(false)
, pPaletteStack(NULL)
, aLineInfo()
, pAreaStack(NULL)
@@ -434,7 +434,7 @@ OS2METReader::~OS2METReader()
{
}
sal_Bool OS2METReader::IsLineInfo()
bool OS2METReader::IsLineInfo()
{
return ( ! ( aLineInfo.IsDefault() || ( aLineInfo.GetStyle() == LINE_NONE ) || ( pVirDev->GetLineColor() == COL_TRANSPARENT ) ) );
}
@@ -482,7 +482,7 @@ void OS2METReader::AddPointsToArea(const Polygon & rPoly)
if (pAreaStack==NULL || rPoly.GetSize()==0) return;
PolyPolygon * pPP=&(pAreaStack->aPPoly);
if (pPP->Count()==0 || pAreaStack->bClosed==sal_True) pPP->Insert(rPoly);
if (pPP->Count()==0 || pAreaStack->bClosed) pPP->Insert(rPoly);
else {
Polygon aLastPoly(pPP->GetObject(pPP->Count()-1));
nOldSize=aLastPoly.GetSize();
@@ -494,7 +494,7 @@ void OS2METReader::AddPointsToArea(const Polygon & rPoly)
}
pPP->Replace(aLastPoly,pPP->Count()-1);
}
pAreaStack->bClosed=sal_False;
pAreaStack->bClosed=false;
}
void OS2METReader::AddPointsToPath(const Polygon & rPoly)
@@ -518,13 +518,13 @@ void OS2METReader::AddPointsToPath(const Polygon & rPoly)
pPP->Replace(aLastPoly,pPP->Count()-1);
}
}
pPathStack->bClosed=sal_False;
pPathStack->bClosed=false;
}
void OS2METReader::CloseFigure()
{
if (pAreaStack!=NULL) pAreaStack->bClosed=sal_True;
else if (pPathStack!=NULL) pPathStack->bClosed=sal_True;
if (pAreaStack!=NULL) pAreaStack->bClosed=true;
else if (pPathStack!=NULL) pPathStack->bClosed=true;
}
void OS2METReader::PushAttr(sal_uInt16 nPushOrder)
@@ -644,7 +644,7 @@ void OS2METReader::PopAttr()
delete p;
}
void OS2METReader::ChangeBrush(const Color& rPatColor, const Color& /*rBGColor*/, sal_Bool bFill )
void OS2METReader::ChangeBrush(const Color& rPatColor, const Color& /*rBGColor*/, bool bFill )
{
Color aColor;
@@ -763,7 +763,7 @@ sal_uLong OS2METReader::ReadLittleEndian3BytesLong()
return ((((sal_uLong)nHi)&0xff)<<16)|((((sal_uLong)nMed)&0xff)<<8)|(((sal_uLong)nLo)&0xff);
}
long OS2METReader::ReadCoord(sal_Bool b32)
long OS2METReader::ReadCoord(bool b32)
{
sal_Int32 l;
@@ -772,7 +772,7 @@ long OS2METReader::ReadCoord(sal_Bool b32)
return l;
}
Point OS2METReader::ReadPoint( const sal_Bool bAdjustBoundRect )
Point OS2METReader::ReadPoint( const bool bAdjustBoundRect )
{
long x,y;
@@ -797,7 +797,7 @@ RasterOp OS2METReader::OS2MixToRasterOp(sal_uInt8 nMix)
}
}
void OS2METReader::ReadLine(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
void OS2METReader::ReadLine(bool bGivenPos, sal_uInt16 nOrderLen)
{
sal_uInt16 i,nPolySize;
@@ -820,7 +820,7 @@ void OS2METReader::ReadLine(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
}
}
void OS2METReader::ReadRelLine(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
void OS2METReader::ReadRelLine(bool bGivenPos, sal_uInt16 nOrderLen)
{
sal_uInt16 i,nPolySize;
Point aP0;
@@ -858,7 +858,7 @@ void OS2METReader::ReadRelLine(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
}
}
void OS2METReader::ReadBox(sal_Bool bGivenPos)
void OS2METReader::ReadBox(bool bGivenPos)
{
sal_uInt8 nFlags;
Point P0;
@@ -896,7 +896,7 @@ void OS2METReader::ReadBox(sal_Bool bGivenPos)
}
else
{
ChangeBrush( Color( COL_TRANSPARENT ), Color( COL_TRANSPARENT ), sal_False );
ChangeBrush( Color( COL_TRANSPARENT ), Color( COL_TRANSPARENT ), false );
SetRasterOp(aAttr.eLinMix);
}
@@ -941,7 +941,7 @@ void OS2METReader::ReadBitBlt()
}
}
void OS2METReader::ReadChrStr(sal_Bool bGivenPos, sal_Bool bMove, sal_Bool bExtra, sal_uInt16 nOrderLen)
void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt16 nOrderLen)
{
Point aP0;
sal_uInt16 i, nLen;
@@ -965,8 +965,8 @@ void OS2METReader::ReadChrStr(sal_Bool bGivenPos, sal_Bool bMove, sal_Bool bExtr
if (bExtra)
{
pOS2MET->SeekRel(2);
ReadPoint( sal_False );
ReadPoint( sal_False );
ReadPoint( false );
ReadPoint( false );
pOS2MET->ReadUInt16( nLen );
}
else
@@ -1012,7 +1012,7 @@ void OS2METReader::ReadChrStr(sal_Bool bGivenPos, sal_Bool bMove, sal_Bool bExtr
}
}
void OS2METReader::ReadArc(sal_Bool bGivenPos)
void OS2METReader::ReadArc(bool bGivenPos)
{
Point aP1, aP2, aP3;
double x1,y1,x2,y2,x3,y3,p,q,cx,cy,ncx,ncy,r,rx,ry,w1,w3;
@@ -1056,7 +1056,7 @@ void OS2METReader::ReadArc(sal_Bool bGivenPos)
}
}
void OS2METReader::ReadFullArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize)
void OS2METReader::ReadFullArc(bool bGivenPos, sal_uInt16 nOrderSize)
{
Point aCenter;
long nP,nQ,nR,nS;
@@ -1098,13 +1098,13 @@ void OS2METReader::ReadFullArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize)
else
{
SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
ChangeBrush(Color( COL_TRANSPARENT ),Color( COL_TRANSPARENT ),sal_False);
ChangeBrush(Color( COL_TRANSPARENT ),Color( COL_TRANSPARENT ),false);
SetRasterOp(aAttr.eLinMix);
}
pVirDev->DrawEllipse(aRect);
}
void OS2METReader::ReadPartialArc(sal_Bool bGivenPos, sal_uInt16 nOrderSize)
void OS2METReader::ReadPartialArc(bool bGivenPos, sal_uInt16 nOrderSize)
{
Point aP0, aCenter,aPStart,aPEnd;
sal_Int32 nP,nQ,nR,nS,nStart, nSweep;
@@ -1184,7 +1184,7 @@ void OS2METReader::ReadPolygons()
DrawPolyPolygon( aPolyPoly );
}
void OS2METReader::ReadBezier(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
void OS2METReader::ReadBezier(bool bGivenPos, sal_uInt16 nOrderLen)
{
sal_uInt16 i, nNumPoints = nOrderLen / ( bCoord32 ? 8 : 4 );
@@ -1244,7 +1244,7 @@ void OS2METReader::ReadBezier(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
}
}
void OS2METReader::ReadFillet(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
void OS2METReader::ReadFillet(bool bGivenPos, sal_uInt16 nOrderLen)
{
sal_uInt16 i,nNumPoints;
@@ -1266,7 +1266,7 @@ void OS2METReader::ReadFillet(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
}
}
void OS2METReader::ReadFilletSharp(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
void OS2METReader::ReadFilletSharp(bool bGivenPos, sal_uInt16 nOrderLen)
{
sal_uInt16 i,nNumPoints;
@@ -1290,7 +1290,7 @@ void OS2METReader::ReadFilletSharp(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
}
}
void OS2METReader::ReadMarker(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
void OS2METReader::ReadMarker(bool bGivenPos, sal_uInt16 nOrderLen)
{
sal_uInt16 i,nNumPoints;
long x,y;
@@ -1299,11 +1299,11 @@ void OS2METReader::ReadMarker(sal_Bool bGivenPos, sal_uInt16 nOrderLen)
SetRasterOp(aAttr.eMrkMix);
if (aAttr.nMrkSymbol>=5 && aAttr.nMrkSymbol<=9)
{
ChangeBrush(aAttr.aMrkCol,aAttr.aMrkCol,sal_True);
ChangeBrush(aAttr.aMrkCol,aAttr.aMrkCol,true);
}
else
{
ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),sal_False);
ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),false);
}
if (bCoord32) nNumPoints=nOrderLen/8; else nNumPoints=nOrderLen/4;
if (!bGivenPos) nNumPoints++;
@@ -1394,42 +1394,42 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
{
switch (nOrderID) {
case GOrdGivArc: ReadArc(sal_True); break;
case GOrdCurArc: ReadArc(sal_False); break;
case GOrdGivArc: ReadArc(true); break;
case GOrdCurArc: ReadArc(false); break;
case GOrdGivBzr: ReadBezier(sal_True,nOrderLen); break;
case GOrdCurBzr: ReadBezier(sal_False,nOrderLen); break;
case GOrdGivBzr: ReadBezier(true,nOrderLen); break;
case GOrdCurBzr: ReadBezier(false,nOrderLen); break;
case GOrdGivBox: ReadBox(sal_True); break;
case GOrdCurBox: ReadBox(sal_False); break;
case GOrdGivBox: ReadBox(true); break;
case GOrdCurBox: ReadBox(false); break;
case GOrdGivFil: ReadFillet(sal_True,nOrderLen); break;
case GOrdCurFil: ReadFillet(sal_False,nOrderLen); break;
case GOrdGivFil: ReadFillet(true,nOrderLen); break;
case GOrdCurFil: ReadFillet(false,nOrderLen); break;
case GOrdGivCrc: ReadFullArc(sal_True,nOrderLen); break;
case GOrdCurCrc: ReadFullArc(sal_False,nOrderLen); break;
case GOrdGivCrc: ReadFullArc(true,nOrderLen); break;
case GOrdCurCrc: ReadFullArc(false,nOrderLen); break;
case GOrdGivLin: ReadLine(sal_True, nOrderLen); break;
case GOrdCurLin: ReadLine(sal_False, nOrderLen); break;
case GOrdGivLin: ReadLine(true, nOrderLen); break;
case GOrdCurLin: ReadLine(false, nOrderLen); break;
case GOrdGivMrk: ReadMarker(sal_True, nOrderLen); break;
case GOrdCurMrk: ReadMarker(sal_False, nOrderLen); break;
case GOrdGivMrk: ReadMarker(true, nOrderLen); break;
case GOrdCurMrk: ReadMarker(false, nOrderLen); break;
case GOrdGivArP: ReadPartialArc(sal_True,nOrderLen); break;
case GOrdCurArP: ReadPartialArc(sal_False,nOrderLen); break;
case GOrdGivArP: ReadPartialArc(true,nOrderLen); break;
case GOrdCurArP: ReadPartialArc(false,nOrderLen); break;
case GOrdGivRLn: ReadRelLine(sal_True,nOrderLen); break;
case GOrdCurRLn: ReadRelLine(sal_False,nOrderLen); break;
case GOrdGivRLn: ReadRelLine(true,nOrderLen); break;
case GOrdCurRLn: ReadRelLine(false,nOrderLen); break;
case GOrdGivSFl: ReadFilletSharp(sal_True,nOrderLen); break;
case GOrdCurSFl: ReadFilletSharp(sal_False,nOrderLen); break;
case GOrdGivSFl: ReadFilletSharp(true,nOrderLen); break;
case GOrdCurSFl: ReadFilletSharp(false,nOrderLen); break;
case GOrdGivStM: ReadChrStr(sal_True , sal_True , sal_False, nOrderLen); break;
case GOrdCurStM: ReadChrStr(sal_False, sal_True , sal_False, nOrderLen); break;
case GOrdGivStr: ReadChrStr(sal_True , sal_False, sal_False, nOrderLen); break;
case GOrdCurStr: ReadChrStr(sal_False, sal_False, sal_False, nOrderLen); break;
case GOrdGivStx: ReadChrStr(sal_True , sal_False, sal_True , nOrderLen); break;
case GOrdCurStx: ReadChrStr(sal_False, sal_False, sal_True , nOrderLen); break;
case GOrdGivStM: ReadChrStr(true , true , false, nOrderLen); break;
case GOrdCurStM: ReadChrStr(false, true , false, nOrderLen); break;
case GOrdGivStr: ReadChrStr(true , false, false, nOrderLen); break;
case GOrdCurStr: ReadChrStr(false, false, false, nOrderLen); break;
case GOrdGivStx: ReadChrStr(true , false, true , nOrderLen); break;
case GOrdCurStx: ReadChrStr(false, false, true , nOrderLen); break;
case GOrdGivImg: SAL_INFO("filter.os2met","GOrdGivImg");
break;
@@ -1442,7 +1442,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
case GOrdBegAra: {
OSArea * p=new OSArea;
p->bClosed=sal_False;
p->bClosed=false;
p->pSucc=pAreaStack; pAreaStack=p;
pOS2MET->ReadUChar( p->nFlags );
p->aCol=aAttr.aPatCol;
@@ -1492,8 +1492,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
p->pSucc=pPathStack; pPathStack=p;
pOS2MET->SeekRel(2);
pOS2MET->ReadUInt32( p->nID );
p->bClosed=sal_False;
p->bStroke=sal_False;
p->bClosed=false;
p->bStroke=false;
break;
}
case GOrdEndPth: {
@@ -1533,7 +1533,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
if( p->bStroke )
{
SetPen( aAttr.aPatCol, aAttr.nStrLinWidth, PEN_SOLID );
ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),sal_False);
ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),false);
SetRasterOp( aAttr.ePatMix );
if ( IsLineInfo() )
{
@@ -1563,7 +1563,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
p = p->pSucc;
if( p )
p->bStroke = sal_True;
p->bStroke = true;
}
break;
@@ -1581,11 +1581,11 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
{
SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
SetRasterOp(aAttr.eLinMix);
ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),sal_False);
ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),false);
nC=p->aPPoly.Count();
for (i=0; i<nC; i++)
{
if (i+1<nC || p->bClosed==sal_True)
if (i+1<nC || p->bClosed)
DrawPolygon( p->aPPoly.GetObject( i ) );
else
DrawPolyLine( p->aPPoly.GetObject( i ) );
@@ -2054,8 +2054,8 @@ void OS2METReader::ReadDsc(sal_uInt16 nDscID, sal_uInt16 /*nDscLen*/)
sal_uInt8 nbyte;
pOS2MET->SeekRel(6);
pOS2MET->ReadUChar( nbyte );
if (nbyte==0x05) bCoord32=sal_True;
else if (nbyte==0x04) bCoord32=sal_False;
if (nbyte==0x05) bCoord32=true;
else if (nbyte==0x04) bCoord32=false;
else {
pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
ErrorCode=1;
@@ -2065,7 +2065,7 @@ void OS2METReader::ReadDsc(sal_uInt16 nDscID, sal_uInt16 /*nDscLen*/)
case 0x00f6:
{
// 'Set Picture Descriptor'
sal_Bool b32;
bool b32;
sal_uInt8 nbyte,nUnitType;
long x1,y1,x2,y2,nt,xr,yr;
@@ -2073,12 +2073,12 @@ void OS2METReader::ReadDsc(sal_uInt16 nDscID, sal_uInt16 /*nDscLen*/)
pOS2MET->ReadUChar( nbyte );
if (nbyte==0x05)
b32=sal_True;
b32=true;
else if(nbyte==0x04)
b32=sal_False;
b32=false;
else
{
b32 = sal_False; // -Wall added the case.
b32 = false; // -Wall added the case.
pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
ErrorCode=2;
}
@@ -2530,7 +2530,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
nOrigPos = pOS2MET->Tell();
nOrigNumberFormat = pOS2MET->GetNumberFormatInt();
bCoord32 = sal_True;
bCoord32 = true;
pPaletteStack=NULL;
pAreaStack=NULL;
pPathStack=NULL;
@@ -2573,7 +2573,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
aDefAttr.nMrkPrec =0x01;
aDefAttr.nMrkSet =0xff;
aDefAttr.nMrkSymbol =0x01;
aDefAttr.bFill =sal_True;
aDefAttr.bFill =true;
aDefAttr.nStrLinWidth=0;
aAttr=aDefAttr;
@@ -2596,7 +2596,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
nPercent = (nPos-nStartPos)*100 / nRemaining;
if (nLastPercent+4<=nPercent) {
if (Callback((sal_uInt16)nPercent)==sal_True) break;
if (Callback((sal_uInt16)nPercent)) break;
nLastPercent=nPercent;
}
@@ -2716,14 +2716,14 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
OS2METReader aOS2METReader;
GDIMetaFile aMTF;
sal_Bool bRet = sal_False;
bool bRet = false;
aOS2METReader.ReadOS2MET( rStream, aMTF );
if ( !rStream.GetError() )
{
rGraphic=Graphic( aMTF );
bRet = sal_True;
bRet = true;
}
return bRet;
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 12e091e..57ad500 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -31,23 +31,23 @@ private:
SvStream& mrPBM; // the PBM file to read
sal_Bool mbStatus;
sal_Bool mbRemark; // sal_False if the stream is in a comment
sal_Bool mbRaw; // RAW/ASCII MODE
bool mbStatus;
bool mbRemark; // sal_False if the stream is in a comment
bool mbRaw; // RAW/ASCII MODE
sal_uLong mnMode; // 0->PBM, 1->PGM, 2->PPM
Bitmap maBmp;
BitmapWriteAccess* mpAcc;
sal_uLong mnWidth, mnHeight; // dimensions in pixel
sal_uLong mnCol;
sal_uLong mnMaxVal; // max value in the <missing comment>
sal_Bool ImplCallback( sal_uInt16 nPercent );
sal_Bool ImplReadBody();
sal_Bool ImplReadHeader();
bool ImplCallback( sal_uInt16 nPercent );
bool ImplReadBody();
bool ImplReadHeader();
public:
PBMReader(SvStream & rPBM);
~PBMReader();
sal_Bool ReadPBM(Graphic & rGraphic );
bool ReadPBM(Graphic & rGraphic );
};
//=================== Methods of PBMReader ==============================
@@ -70,7 +70,7 @@ PBMReader::~PBMReader()
{
}
sal_Bool PBMReader::ImplCallback( sal_uInt16 /*nPercent*/ )
bool PBMReader::ImplCallback( sal_uInt16 /*nPercent*/ )
{
/*
if ( pCallback != NULL )
@@ -82,25 +82,25 @@ sal_Bool PBMReader::ImplCallback( sal_uInt16 /*nPercent*/ )
}
}
*/
return sal_False;
return false;
}
sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
bool PBMReader::ReadPBM(Graphic & rGraphic )
{
sal_uInt16 i;
if ( mrPBM.GetError() )
return sal_False;
return false;
mrPBM.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
// read header:
if ( ( mbStatus = ImplReadHeader() ) == sal_False )
return sal_False;
if ( ( mbStatus = ImplReadHeader() ) == false )
return false;
if ( ( mnMaxVal == 0 ) || ( mnWidth == 0 ) || ( mnHeight == 0 ) )
return sal_False;
return false;
// 0->PBM, 1->PGM, 2->PPM
switch ( mnMode )
@@ -108,7 +108,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
case 0 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
return false;
mpAcc->SetPaletteEntryCount( 2 );
mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) );
mpAcc->SetPaletteColor( 1, BitmapColor( 0x00, 0x00, 0x00 ) );
@@ -123,7 +123,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
maBmp = Bitmap( Size( mnWidth, mnHeight ), 8);
if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
return false;
mnCol = (sal_uInt16)mnMaxVal + 1;
if ( mnCol > 256 )
mnCol = 256;
@@ -138,7 +138,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
case 2 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 );
if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
return false;
break;
}
@@ -155,56 +155,56 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic )
return mbStatus;
}
sal_Bool PBMReader::ImplReadHeader()
bool PBMReader::ImplReadHeader()
{
sal_uInt8 nID[ 2 ];
sal_uInt8 nDat;
sal_uInt8 nMax, nCount = 0;
sal_Bool bFinished = sal_False;
bool bFinished = false;
mrPBM.ReadUChar( nID[ 0 ] ).ReadUChar( nID[ 1 ] );
if ( nID[ 0 ] != 'P' )
return sal_False;
return false;
mnMaxVal = mnWidth = mnHeight = 0;
switch ( nID[ 1 ] )
{
case '1' :
mbRaw = sal_False;
mbRaw = false;
case '4' :
mnMode = 0;
nMax = 2; // number of parameters in Header
mnMaxVal = 1;
break;
case '2' :
mbRaw = sal_False;
mbRaw = false;
case '5' :
mnMode = 1;
nMax = 3;
break;
case '3' :
mbRaw = sal_False;
mbRaw = false;
case '6' :
mnMode = 2;
nMax = 3;
break;
default:
return sal_False;
return false;
}
while ( bFinished == sal_False )
while ( bFinished == false )
{
if ( mrPBM.GetError() )
return sal_False;
return false;
mrPBM.ReadUChar( nDat );
if ( nDat == '#' )
{
mbRemark = sal_True;
mbRemark = true;
continue;
}
else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
{
mbRemark = sal_False;
mbRemark = false;
nDat = 0x20;
}
if ( mbRemark )
@@ -217,11 +217,11 @@ sal_Bool PBMReader::ImplReadHeader()
else if ( ( nCount == 1 ) && mnHeight )
{
if ( ++nCount == nMax )
bFinished = sal_True;
bFinished = true;
}
else if ( ( nCount == 2 ) && mnMaxVal )
{
bFinished = sal_True;
bFinished = true;
}
continue;
}
@@ -245,14 +245,14 @@ sal_Bool PBMReader::ImplReadHeader()
}
}
else
return sal_False;
return false;
}
return mbStatus;
}
sal_Bool PBMReader::ImplReadBody()
bool PBMReader::ImplReadBody()
{
sal_Bool bPara, bFinished = sal_False;
bool bPara, bFinished = false;
sal_uInt8 nDat = 0, nCount;
sal_uLong nGrey, nRGB[3];
sal_uLong nWidth = 0;
@@ -269,7 +269,7 @@ sal_Bool PBMReader::ImplReadBody()
while ( nHeight != mnHeight )
{
if ( mrPBM.IsEof() || mrPBM.GetError() )
return sal_False;
return false;
if ( --nShift < 0 )
{
@@ -292,7 +292,7 @@ sal_Bool PBMReader::ImplReadBody()
while ( nHeight != mnHeight )
{
if ( mrPBM.IsEof() || mrPBM.GetError() )
return sal_False;
return false;
mrPBM.ReadUChar( nDat );
mpAcc->SetPixelIndex( nHeight, nWidth++, nDat);
@@ -311,7 +311,7 @@ sal_Bool PBMReader::ImplReadBody()
while ( nHeight != mnHeight )
{
if ( mrPBM.IsEof() || mrPBM.GetError() )
return sal_False;
return false;
sal_uInt8 nR, nG, nB;
sal_uLong nRed, nGreen, nBlue;
@@ -334,21 +334,21 @@ sal_Bool PBMReader::ImplReadBody()
{
// PBM
case 0 :
while ( bFinished == sal_False )
while ( bFinished == false )
{
if ( mrPBM.IsEof() || mrPBM.GetError() )
return sal_False;
return false;
mrPBM.ReadUChar( nDat );
if ( nDat == '#' )
{
mbRemark = sal_True;
mbRemark = true;
continue;
}
else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
{
mbRemark = sal_False;
mbRemark = false;
continue;
}
if ( mbRemark || nDat == 0x20 || nDat == 0x09 )
@@ -362,23 +362,23 @@ sal_Bool PBMReader::ImplReadBody()
{
nWidth = 0;
if ( ++nHeight == mnHeight )
bFinished = sal_True;
bFinished = true;
ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
}
else
return sal_False;
return false;
}
break;
// PGM
case 1 :
bPara = sal_False;
bPara = false;
nCount = 0;
nGrey = 0;
while ( bFinished == sal_False )
while ( bFinished == false )
{
if ( nCount )
{
@@ -391,33 +391,33 @@ sal_Bool PBMReader::ImplReadBody()
{
nWidth = 0;
if ( ++nHeight == mnHeight )
bFinished = sal_True;
bFinished = true;
ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
continue;
}
if ( mrPBM.IsEof() || mrPBM.GetError() )
return sal_False;
return false;
mrPBM.ReadUChar( nDat );
if ( nDat == '#' )
{
mbRemark = sal_True;
mbRemark = true;
if ( bPara )
{
bPara = sal_False;
bPara = false;
nCount++;
}
continue;
}
else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
{
mbRemark = sal_False;
mbRemark = false;
if ( bPara )
{
bPara = sal_False;
bPara = false;
nCount++;
}
continue;
@@ -427,20 +427,20 @@ sal_Bool PBMReader::ImplReadBody()
{
if ( bPara )
{
bPara = sal_False;
bPara = false;
nCount++;
}
continue;
}
if ( nDat >= '0' && nDat <= '9' )
{
bPara = sal_True;
bPara = true;
nGrey *= 10;
nGrey += nDat-'0';
continue;
}
else
return sal_False;
return false;
}
break;
@@ -449,11 +449,11 @@ sal_Bool PBMReader::ImplReadBody()
// PPM
case 2 :
bPara = sal_False;
bPara = false;
nCount = 0;
nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0;
while ( bFinished == sal_False )
while ( bFinished == false )
{
if ( nCount == 3 )
{
@@ -467,33 +467,33 @@ sal_Bool PBMReader::ImplReadBody()
{
nWidth = 0;
if ( ++nHeight == mnHeight )
bFinished = sal_True;
bFinished = true;
ImplCallback( (sal_uInt16) ( ( 100 * nHeight ) / mnHeight ) ); // processing output in percent
}
continue;
}
if ( mrPBM.IsEof() || mrPBM.GetError() )
return sal_False;
return false;
mrPBM.ReadUChar( nDat );
if ( nDat == '#' )
{
mbRemark = sal_True;
mbRemark = true;
if ( bPara )
{
bPara = sal_False;
bPara = false;
nCount++;
}
continue;
}
else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
{
mbRemark = sal_False;
mbRemark = false;
if ( bPara )
{
bPara = sal_False;
bPara = false;
nCount++;
}
continue;
@@ -503,20 +503,20 @@ sal_Bool PBMReader::ImplReadBody()
{
if ( bPara )
{
bPara = sal_False;
bPara = false;
nCount++;
}
continue;
}
if ( nDat >= '0' && nDat <= '9' )
{
bPara = sal_True;
bPara = true;
nRGB[ nCount ] *= 10;
nRGB[ nCount ] += nDat-'0';
continue;
}
else
return sal_False;
return false;
}
break;
}
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index af591c2..6a2220e 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -43,7 +43,7 @@ class PCDReader {
private:
sal_Bool bStatus;
bool bStatus;
sal_uLong nLastPercent;
@@ -84,16 +84,16 @@ public:
}
~PCDReader() {}
sal_Bool ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem );
bool ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem );
};
//=================== Methods of PCDReader ==============================
sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
{
Bitmap aBmp;
bStatus = sal_True;
bStatus = true;
nLastPercent = 0;
MayCallback( 0 );
@@ -136,7 +136,7 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
break;
default:
bStatus = sal_False;
bStatus = false;
}
if ( bStatus )
{
@@ -152,7 +152,7 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
}
aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 );
if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
return false;
ReadImage( 5 ,65 );
@@ -178,14 +178,14 @@ void PCDReader::CheckPCDImagePacFile()
m_rPCD.Read( Buf, 7 );
Buf[ 7 ] = 0;
if (OString(Buf) != "PCD_IPI")
bStatus = sal_False;
bStatus = false;
}
void PCDReader::ReadOrientation()
{
if ( bStatus == sal_False )
if ( bStatus == false )
return;
m_rPCD.Seek( 194635 );
m_rPCD.ReadUChar( nOrientation );
@@ -205,7 +205,7 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
sal_uInt8 * pCr; // red chrominance fuer je 2x2 pixel of the current pair of rows
sal_uInt8 * pL0N, * pL1N, * pCbN, * pCrN; // like above, but for the next pair of rows
if ( bStatus == sal_False )
if ( bStatus == false )
return;
nW2=nWidth>>1;
@@ -231,7 +231,7 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
rtl_freeMemory((void*)pL1N);
rtl_freeMemory((void*)pCbN);
rtl_freeMemory((void*)pCrN);
bStatus = sal_False;
bStatus = false;
return;
}
@@ -350,9 +350,9 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
}
if ( m_rPCD.GetError() )
bStatus = sal_False;
bStatus = false;
MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * nYPair / nH2 );
if ( bStatus == sal_False )
if ( bStatus == false )
break;
}
rtl_freeMemory((void*)pL0 );
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index abad65f..2d941b8 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -44,10 +44,10 @@ private:
sal_uInt16 nResX, nResY; // resolution in pixel per inch oder 0,0
sal_uInt16 nDestBitsPerPixel; // bits per pixel in destination bitmap 1,4,8 or 24
sal_uInt8* pPalette;
sal_Bool nStatus; // from now on do not read status from stream ( SJ )
bool nStatus; // from now on do not read status from stream ( SJ )
sal_Bool Callback( sal_uInt16 nPercent );
bool Callback( sal_uInt16 nPercent );
void ImplReadBody();
void ImplReadPalette( sal_uLong nCol );
void ImplReadHeader();
@@ -55,7 +55,7 @@ private:
public:
PCXReader(SvStream &rStream);
~PCXReader();
sal_Bool ReadPCX(Graphic & rGraphic );
bool ReadPCX(Graphic & rGraphic );
// Reads a PCX file from the stream and fills the GDIMetaFile
};
@@ -85,15 +85,15 @@ PCXReader::~PCXReader()
delete[] pPalette;
}
sal_Bool PCXReader::Callback( sal_uInt16 /*nPercent*/ )
bool PCXReader::Callback( sal_uInt16 /*nPercent*/ )
{
return sal_False;
return false;
}
sal_Bool PCXReader::ReadPCX(Graphic & rGraphic)
bool PCXReader::ReadPCX(Graphic & rGraphic)
{
if ( m_rPCX.GetError() )
return sal_False;
return false;
sal_uLong* pDummy = new sal_uLong; delete pDummy; // to achive that under OS/2
// the right (Tools-) new is used
@@ -104,7 +104,7 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic)
// read header:
nStatus = sal_True;
nStatus = true;
ImplReadHeader();
@@ -113,7 +113,7 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic)
{
aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
if ( ( pAcc = aBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
return false;
if ( nDestBitsPerPixel <= 8 )
{
@@ -152,10 +152,10 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic)
{
aBmp.ReleaseAccess( pAcc ), pAcc = NULL;
rGraphic = aBmp;
return sal_True;
return true;
}
}
return sal_False;
return false;
}
void PCXReader::ImplReadHeader()
@@ -164,7 +164,7 @@ void PCXReader::ImplReadHeader()
m_rPCX.ReadUChar( nbyte ).ReadUChar( nVersion ).ReadUChar( nEncoding );
if ( nbyte!=0x0a || (nVersion != 0 && nVersion != 2 && nVersion != 3 && nVersion != 5) || nEncoding > 1 )
{
nStatus = sal_False;
nStatus = false;
return;
}
@@ -175,7 +175,7 @@ void PCXReader::ImplReadHeader()
if ((nMinX > nMaxX) || (nMinY > nMaxY))
{
nStatus = sal_False;
nStatus = false;
return;
}
@@ -204,7 +204,7 @@ void PCXReader::ImplReadHeader()
if ( ( nDestBitsPerPixel != 1 && nDestBitsPerPixel != 4 && nDestBitsPerPixel != 8 && nDestBitsPerPixel != 24 )
|| nPlanes > 4 || nBytesPerPlaneLin < ( ( nWidth * nBitsPerPlanePix+7 ) >> 3 ) )
{
nStatus = sal_False;
nStatus = false;
return;
}
@@ -232,14 +232,14 @@ void PCXReader::ImplReadBody()
{
if (m_rPCX.GetError() || m_rPCX.IsEof())
{
nStatus = sal_False;
nStatus = false;
break;
}
nPercent = ny * 60 / nHeight + 10;
if ( ny == 0 || nLastPercent + 4 <= nPercent )
{
nLastPercent = nPercent;
if ( Callback( (sal_uInt16)nPercent ) == sal_True )
if ( Callback( (sal_uInt16)nPercent ) )
break;
}
for ( np = 0; np < nPlanes; np++)
@@ -386,7 +386,7 @@ void PCXReader::ImplReadBody()
}
break;
default :
nStatus = sal_False;
nStatus = false;
break;
}
}
@@ -420,8 +420,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PCXReader aPCXReader(rStream);
sal_Bool nRetValue = aPCXReader.ReadPCX(rGraphic);
if ( nRetValue == sal_False )
bool nRetValue = aPCXReader.ReadPCX(rGraphic);
if ( nRetValue == false )
rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
return nRetValue;
}
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 4338672..3cbf4a2 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -149,7 +149,7 @@ private:
sal_uLong nOrigPos; // Initial position in pPict.
sal_uInt16 nOrigNumberFormat; // Initial number format von pPict.
sal_Bool IsVersion2; // If it is a version 2 Pictfile.
bool IsVersion2; // If it is a version 2 Pictfile.
Rectangle aBoundingRect; // Min/Max-Rectangle for the whole drawing.
Point aPenPosition;
@@ -169,7 +169,7 @@ private:
Fraction aHRes;
Fraction aVRes;
sal_Bool Callback(sal_uInt16 nPercent);
bool Callback(sal_uInt16 nPercent);
Point ReadPoint();
@@ -224,9 +224,9 @@ private:
sal_uLong ReadAndDrawText();
sal_uLong ReadPixMapEtc(Bitmap & rBitmap, sal_Bool bBaseAddr, sal_Bool bColorTable,
sal_uLong ReadPixMapEtc(Bitmap & rBitmap, bool bBaseAddr, bool bColorTable,
Rectangle * pSrcRect, Rectangle * pDestRect,
sal_Bool bMode, sal_Bool bMaskRgn);
bool bMode, bool bMaskRgn);
void ReadHeader();
// Reads the header of the Pict file, set IsVersion and aBoundingRect
@@ -360,9 +360,9 @@ void PictReader::SetFillColor( const Color& rColor )
pVirDev->SetFillColor( rColor );
}
sal_Bool PictReader::Callback(sal_uInt16 /*nPercent*/)
bool PictReader::Callback(sal_uInt16 /*nPercent*/)
{
return sal_False;
return false;
}
Point PictReader::ReadPoint()
@@ -489,7 +489,7 @@ sal_uLong PictReader::ReadPixPattern(PictReader::Pattern &pattern)
pPict->ReadUInt16( nPatType );
if (nPatType==1) {
pattern.read(*pPict);
nDataSize=ReadPixMapEtc(aBMP,sal_False,sal_True,NULL,NULL,sal_False,sal_False);
nDataSize=ReadPixMapEtc(aBMP,false,true,NULL,NULL,false,false);
// CHANGEME: use average pixmap colors to update the pattern, ...
if (nDataSize!=0xffffffff) nDataSize+=10;
}
@@ -702,8 +702,8 @@ sal_uLong PictReader::ReadAndDrawText()
return nDataLen;
}
sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, sal_Bool bBaseAddr, sal_Bool bColorTable, Rectangle* pSrcRect,
Rectangle* pDestRect, sal_Bool bMode, sal_Bool bMaskRgn )
sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColorTable, Rectangle* pSrcRect,
Rectangle* pDestRect, bool bMode, bool bMaskRgn )
{
Bitmap aBitmap;
BitmapWriteAccess* pAcc = NULL;
@@ -1141,7 +1141,7 @@ void PictReader::ReadHeader()
if ( sBuf[ 0 ] == 0x11 && sBuf[ 1 ] == 0x01 ) {
// pict v1 must be rare and we do only few tests
if (st < 2) { confidence[st] = --actualConfid; continue; }
IsVersion2 = sal_False; return;
IsVersion2 = false; return;
}
if (sBuf[0] != 0x00) continue; // unrecovable error
int numZero = 0;
@@ -1159,11 +1159,11 @@ void PictReader::ReadHeader()
if (sBuf[1] == 0x01 ) {
// pict v1 must be rare and we do only few tests
if (st < 2) { confidence[st] = --actualConfid; continue; }
IsVersion2 = sal_False; return;
IsVersion2 = false; return;
}
if (sBuf[1] != 0x02 ) continue; // not a version 2 file
IsVersion2=sal_True;
IsVersion2=true;
short nExtVer, nReserved;
// 3 Bytes ignored : end of version arg 0x02FF (ie: 0xFF), HeaderOp : 0x0C00
pPict->SeekRel( 3 );
@@ -1683,7 +1683,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
case 0x0090: { // BitsRect
Bitmap aBmp;
Rectangle aSrcRect, aDestRect;
nDataSize=ReadPixMapEtc(aBmp, sal_False, sal_True, &aSrcRect, &aDestRect, sal_True, sal_False);
nDataSize=ReadPixMapEtc(aBmp, false, true, &aSrcRect, &aDestRect, true, false);
DrawingMethod(PDM_PAINT);
pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
break;
@@ -1691,7 +1691,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
case 0x0091: { // BitsRgn
Bitmap aBmp;
Rectangle aSrcRect, aDestRect;
nDataSize=ReadPixMapEtc(aBmp, sal_False, sal_True, &aSrcRect, &aDestRect, sal_True, sal_True);
nDataSize=ReadPixMapEtc(aBmp, false, true, &aSrcRect, &aDestRect, true, true);
DrawingMethod(PDM_PAINT);
pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
break;
@@ -1708,7 +1708,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
case 0x0098: { // PackBitsRect
Bitmap aBmp;
Rectangle aSrcRect, aDestRect;
nDataSize=ReadPixMapEtc(aBmp, sal_False, sal_True, &aSrcRect, &aDestRect, sal_True, sal_False);
nDataSize=ReadPixMapEtc(aBmp, false, true, &aSrcRect, &aDestRect, true, false);
DrawingMethod(PDM_PAINT);
pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
break;
@@ -1716,7 +1716,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
case 0x0099: { // PackBitsRgn
Bitmap aBmp;
Rectangle aSrcRect, aDestRect;
nDataSize=ReadPixMapEtc(aBmp, sal_False, sal_True, &aSrcRect, &aDestRect, sal_True, sal_True);
nDataSize=ReadPixMapEtc(aBmp, false, true, &aSrcRect, &aDestRect, true, true);
DrawingMethod(PDM_PAINT);
pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
break;
@@ -1724,7 +1724,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
case 0x009a: { // DirectBitsRect
Bitmap aBmp;
Rectangle aSrcRect, aDestRect;
nDataSize=ReadPixMapEtc(aBmp, sal_True, sal_False, &aSrcRect, &aDestRect, sal_True, sal_False);
nDataSize=ReadPixMapEtc(aBmp, true, false, &aSrcRect, &aDestRect, true, false);
DrawingMethod(PDM_PAINT);
pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
break;
@@ -1732,7 +1732,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
case 0x009b: { // DirectBitsRgn
Bitmap aBmp;
Rectangle aSrcRect, aDestRect;
nDataSize=ReadPixMapEtc(aBmp, sal_True, sal_False, &aSrcRect, &aDestRect, sal_True, sal_True);
nDataSize=ReadPixMapEtc(aBmp, true, false, &aSrcRect, &aDestRect, true, true);
DrawingMethod(PDM_PAINT);
pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
break;
@@ -1821,7 +1821,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
nPercent = (nPos-nStartPos) * 100 / nRemaining;
if (nLastPercent+4<=nPercent) {
if (Callback((sal_uInt16)nPercent)==sal_True) break;
if (Callback((sal_uInt16)nPercent)) break;
nLastPercent=nPercent;
}
@@ -1885,14 +1885,14 @@ GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* )
{
GDIMetaFile aMTF;
PictReader aPictReader;
sal_Bool bRet = sal_False;
bool bRet = false;
aPictReader.ReadPict( rIStm, aMTF );
if ( !rIStm.GetError() )
{
rGraphic = Graphic( aMTF );
bRet = sal_True;
bRet = true;
}
return bRet;
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 45b923c..c95991d 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -60,8 +60,8 @@ private:
sal_uInt32 mnXResFixed;
sal_uInt32 mnYResFixed;
sal_Bool mbStatus;
sal_Bool mbTransparent;
bool mbStatus;
bool mbTransparent;
Bitmap maBmp;
Bitmap maMaskBmp;
@@ -69,16 +69,16 @@ private:
BitmapWriteAccess* mpWriteAcc;
BitmapWriteAccess* mpMaskWriteAcc;
sal_uInt16 mnDestBitDepth;
sal_Bool mbCompression; // RLE decoding
bool mbCompression; // RLE decoding
sal_uInt8* mpPalette;
sal_Bool ImplReadBody();
sal_Bool ImplReadHeader();
bool ImplReadBody();
bool ImplReadHeader();
public:
PSDReader(SvStream &rStream);
~PSDReader();
sal_Bool ReadPSD(Graphic & rGraphic);
bool ReadPSD(Graphic & rGraphic);
};
//=================== Methods of PSDReader ==============================
@@ -88,8 +88,8 @@ PSDReader::PSDReader(SvStream &rStream)
, mpFileHeader(NULL)
, mnXResFixed(0)
, mnYResFixed(0)
, mbStatus(sal_True)
, mbTransparent(sal_False)
, mbStatus(true)
, mbTransparent(false)
, mpReadAcc(NULL)
, mpWriteAcc(NULL)
, mpMaskWriteAcc(NULL)
@@ -105,29 +105,29 @@ PSDReader::~PSDReader()
delete mpFileHeader;
}
sal_Bool PSDReader::ReadPSD(Graphic & rGraphic )
bool PSDReader::ReadPSD(Graphic & rGraphic )
{
if (m_rPSD.GetError())
return sal_False;
return false;
m_rPSD.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
// read header:
if ( ImplReadHeader() == sal_False )
return sal_False;
if ( ImplReadHeader() == false )
return false;
Size aBitmapSize( mpFileHeader->nColumns, mpFileHeader->nRows );
maBmp = Bitmap( aBitmapSize, mnDestBitDepth );
if ( ( mpWriteAcc = maBmp.AcquireWriteAccess() ) == NULL )
mbStatus = sal_False;
mbStatus = false;
if ( ( mpReadAcc = maBmp.AcquireReadAccess() ) == NULL )
mbStatus = sal_False;
mbStatus = false;
if ( mbTransparent && mbStatus )
{
maMaskBmp = Bitmap( aBitmapSize, 1 );
if ( ( mpMaskWriteAcc = maMaskBmp.AcquireWriteAccess() ) == NULL )
mbStatus = sal_False;
mbStatus = false;
}
if ( mpPalette && mbStatus )
{
@@ -157,7 +157,7 @@ sal_Bool PSDReader::ReadPSD(Graphic & rGraphic )
}
}
else
mbStatus = sal_False;
mbStatus = false;
if ( mpWriteAcc )
maBmp.ReleaseAccess( mpWriteAcc );
if ( mpReadAcc )
@@ -169,7 +169,7 @@ sal_Bool PSDReader::ReadPSD(Graphic & rGraphic )
sal_Bool PSDReader::ImplReadHeader()
bool PSDReader::ImplReadHeader()
{
sal_uInt16 nCompression;
sal_uInt32 nColorLength, nResourceLength, nLayerMaskLength;
@@ -177,22 +177,22 @@ sal_Bool PSDReader::ImplReadHeader()
mpFileHeader = new PSDFileHeader;
if ( !mpFileHeader )
return sal_False;
return false;
m_rPSD.ReadUInt32( mpFileHeader->nSignature ).ReadUInt16( mpFileHeader->nVersion ).ReadUInt32( mpFileHeader->nPad1 ). ReadUInt16( mpFileHeader->nPad2 ).ReadUInt16( mpFileHeader->nChannels ).ReadUInt32( mpFileHeader->nRows ). ReadUInt32( mpFileHeader->nColumns ).ReadUInt16( mpFileHeader->nDepth ).ReadUInt16( mpFileHeader->nMode );
if ( ( mpFileHeader->nSignature != 0x38425053 ) || ( mpFileHeader->nVersion != 1 ) )
return sal_False;
return false;
if ( mpFileHeader->nRows == 0 || mpFileHeader->nColumns == 0 )
return sal_False;
return false;
if ( ( mpFileHeader->nRows > 30000 ) || ( mpFileHeader->nColumns > 30000 ) )
return sal_False;
return false;
sal_uInt16 nDepth = mpFileHeader->nDepth;
if (!( ( nDepth == 1 ) || ( nDepth == 8 ) || ( nDepth == 16 ) ) )
return sal_False;
return false;
mnDestBitDepth = ( nDepth == 16 ) ? 8 : nDepth;
@@ -202,27 +202,27 @@ sal_Bool PSDReader::ImplReadHeader()
switch ( mpFileHeader->nChannels )
{
case 5 :
mbTransparent = sal_True;
mbTransparent = true;
case 4 :
mnDestBitDepth = 24;
break;
default :
return sal_False;
return false;
}
}
else switch ( mpFileHeader->nChannels )
{
case 2 :
mbTransparent = sal_True;
mbTransparent = true;
case 1 :
break;
case 4 :
mbTransparent = sal_True;
mbTransparent = true;
case 3 :
mnDestBitDepth = 24;
break;
default:
return sal_False;
return false;
}
switch ( mpFileHeader->nMode )
@@ -230,17 +230,17 @@ sal_Bool PSDReader::ImplReadHeader()
case PSD_BITMAP :
{
if ( nColorLength || ( nDepth != 1 ) )
return sal_False;
return false;
}
break;
case PSD_INDEXED :
{
if ( nColorLength != 768 ) // we need the color map
return sal_False;
return false;
mpPalette = new sal_uInt8[ 768 ];
if ( mpPalette == NULL )
return sal_False;
return false;
m_rPSD.Read( mpPalette, 768 );
}
break;
@@ -252,10 +252,10 @@ sal_Bool PSDReader::ImplReadHeader()
case PSD_GRAYSCALE :
{
if ( nColorLength )
return sal_False;
return false;
mpPalette = new sal_uInt8[ 768 ];
if ( mpPalette == NULL )
return sal_False;
return false;
for ( sal_uInt16 i = 0; i < 256; i++ )
{
mpPalette[ i ] = mpPalette[ i + 256 ] = mpPalette[ i + 512 ] = (sal_uInt8)i;
@@ -269,12 +269,12 @@ sal_Bool PSDReader::ImplReadHeader()
case PSD_LAB :
{
if ( nColorLength ) // color table is not supported by the other graphic modes
return sal_False;
return false;
}
break;
default:
return sal_False;
return false;
}
m_rPSD.ReadUInt32( nResourceLength );
sal_uInt32 nLayerPos = m_rPSD.Tell() + nResourceLength;
@@ -319,22 +319,22 @@ sal_Bool PSDReader::ImplReadHeader()
m_rPSD.ReadUInt16( nCompression );
if ( nCompression == 0 )
{
mbCompression = sal_False;
mbCompression = false;
}
else if ( nCompression == 1 )
{
m_rPSD.SeekRel( ( mpFileHeader->nRows * mpFileHeader->nChannels ) << 1 );
mbCompression = sal_True;
mbCompression = true;
}
else
return sal_False;
return false;
return sal_True;
return true;
}
sal_Bool PSDReader::ImplReadBody()
bool PSDReader::ImplReadBody()
{
sal_uLong nX, nY;
char nRunCount = 0;
@@ -714,7 +714,7 @@ sal_Bool PSDReader::ImplReadBody()
}
}
}
return sal_True;
return true;
}
//================== GraphicImport - the exported function ================
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 705381a..9f71ab7 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -42,7 +42,7 @@ private:
SvStream& m_rRAS; // Die einzulesende RAS-Datei
sal_Bool mbStatus;
bool mbStatus;
Bitmap maBmp;
BitmapWriteAccess* mpAcc;
sal_uInt32 mnWidth, mnHeight; // Bildausmass in Pixeln
@@ -51,23 +51,23 @@ private:
sal_uInt32 mnDepth, mnImageDatSize, mnType;
sal_uInt32 mnColorMapType, mnColorMapSize;
sal_uInt8 mnRepCount, mnRepVal; // RLE Decoding
sal_Bool mbPalette;
bool mbPalette;
sal_Bool ImplReadBody();
sal_Bool ImplReadHeader();
bool ImplReadBody();
bool ImplReadHeader();
sal_uInt8 ImplGetByte();
public:
RASReader(SvStream &rRAS);
~RASReader();
sal_Bool ReadRAS(Graphic & rGraphic);
bool ReadRAS(Graphic & rGraphic);
};
//=================== Methoden von RASReader ==============================
RASReader::RASReader(SvStream &rRAS)
: m_rRAS(rRAS)
, mbStatus(sal_True)
, mbStatus(true)
, mpAcc(NULL)
, mnWidth(0)
, mnHeight(0)
@@ -80,7 +80,7 @@ RASReader::RASReader(SvStream &rRAS)
, mnColorMapSize(0)
, mnRepCount(0)
, mnRepVal(0)
, mbPalette(sal_False)
, mbPalette(false)
{
}
@@ -90,26 +90,26 @@ RASReader::~RASReader()
sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
bool RASReader::ReadRAS(Graphic & rGraphic)
{
sal_uInt32 nMagicNumber;
if ( m_rRAS.GetError() )
return sal_False;
return false;
m_rRAS.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
m_rRAS.ReadUInt32( nMagicNumber );
if ( nMagicNumber != SUNRASTER_MAGICNUMBER )
return sal_False;
return false;
// Kopf einlesen:
if ( ( mbStatus = ImplReadHeader() ) == sal_False )
return sal_False;
if ( ( mbStatus = ImplReadHeader() ) == false )
return false;
maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
return false;
if ( mnDstBitsPerPix <= 8 ) // paletten bildchen
{
@@ -123,7 +123,7 @@ sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
mnDstColors = (sal_uInt16)( mnColorMapSize / 3 );
if ( ( 1 << mnDstBitsPerPix ) < mnDstColors )
return sal_False;
return false;
if ( ( mnDstColors >= 2 ) && ( ( mnColorMapSize % 3 ) == 0 ) )
{
@@ -137,14 +137,14 @@ sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
{
mpAcc->SetPaletteColor( i, BitmapColor( nRed[ i ], nGreen[ i ], nBlue[ i ] ) );
}
mbPalette = sal_True;
mbPalette = true;
}
else
return sal_False;
return false;
}
else if ( mnColorMapType != RAS_COLOR_NO_MAP ) // alles andere ist kein standard
return sal_False;
return false;
if ( !mbPalette )
{
@@ -181,12 +181,12 @@ sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
sal_Bool RASReader::ImplReadHeader()
bool RASReader::ImplReadHeader()
{
m_rRAS.ReadUInt32( mnWidth ).ReadUInt32( mnHeight ).ReadUInt32( mnDepth ).ReadUInt32( mnImageDatSize ). ReadUInt32( mnType ).ReadUInt32( mnColorMapType ).ReadUInt32( mnColorMapSize );
if ( mnWidth == 0 || mnHeight == 0 )
mbStatus = sal_False;
mbStatus = false;
switch ( mnDepth )
{
@@ -200,7 +200,7 @@ sal_Bool RASReader::ImplReadHeader()
break;
default :
mbStatus = sal_False;
mbStatus = false;
}
switch ( mnType )
@@ -212,14 +212,14 @@ sal_Bool RASReader::ImplReadHeader()
break;
default:
mbStatus = sal_False;
mbStatus = false;
}
return mbStatus;
}
sal_Bool RASReader::ImplReadBody()
bool RASReader::ImplReadBody()
{
sal_uLong x, y;
sal_uInt8 nDat = 0;
@@ -306,7 +306,7 @@ sal_Bool RASReader::ImplReadBody()
break;
default:
mbStatus = sal_False;
mbStatus = false;
break;
}
return mbStatus;
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index c2eb2c7..fb09d58 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -88,21 +88,21 @@ private:
TGAExtension* mpExtension;
sal_uInt32* mpColorMap;
sal_Bool mbStatus;
bool mbStatus;
sal_uLong mnTGAVersion; // Enhanced TGA is defined as Version 2.0
sal_uInt16 mnDestBitDepth;
sal_Bool mbIndexing; // sal_True if source contains indexing color values
sal_Bool mbEncoding; // sal_True if source is compressed
bool mbIndexing; // sal_True if source contains indexing color values
bool mbEncoding; // sal_True if source is compressed
sal_Bool ImplReadHeader();
sal_Bool ImplReadPalette();
sal_Bool ImplReadBody();
bool ImplReadHeader();
bool ImplReadPalette();
bool ImplReadBody();
public:
TGAReader(SvStream &rTGA);
~TGAReader();
sal_Bool ReadTGA(Graphic &rGraphic);
bool ReadTGA(Graphic &rGraphic);
};
//=================== Methoden von TGAReader ==============================
@@ -114,11 +114,11 @@ TGAReader::TGAReader(SvStream &rTGA)
, mpFileFooter(NULL)
, mpExtension(NULL)
, mpColorMap(NULL)
, mbStatus(sal_True)
, mbStatus(true)
, mnTGAVersion(1)
, mnDestBitDepth(8)
, mbIndexing(sal_False)
, mbEncoding(sal_False)
, mbIndexing(false)
, mbEncoding(false)
{
}
@@ -132,10 +132,10 @@ TGAReader::~TGAReader()
sal_Bool TGAReader::ReadTGA(Graphic & rGraphic)
bool TGAReader::ReadTGA(Graphic & rGraphic)
{
if ( m_rTGA.GetError() )
return sal_False;
return false;
m_rTGA.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -158,7 +158,7 @@ sal_Bool TGAReader::ReadTGA(Graphic & rGraphic)
mbStatus = ImplReadBody();
}
else
mbStatus = sal_False;
mbStatus = false;
if ( mpAcc )
aBitmap.ReleaseAccess ( mpAcc), mpAcc = NULL;
@@ -172,21 +172,21 @@ sal_Bool TGAReader::ReadTGA(Graphic & rGraphic)
sal_Bool TGAReader::ImplReadHeader()
bool TGAReader::ImplReadHeader()
{
mpFileHeader = new TGAFileHeader;
if ( mpFileHeader == NULL )
return sal_False;
return false;
m_rTGA.ReadUChar( mpFileHeader->nImageIDLength ).ReadUChar( mpFileHeader->nColorMapType ).ReadUChar( mpFileHeader->nImageType ). ReadUInt16( mpFileHeader->nColorMapFirstEntryIndex ).ReadUInt16( mpFileHeader->nColorMapLength ).ReadUChar( mpFileHeader->nColorMapEntrySize ). ReadUInt16( mpFileHeader->nColorMapXOrigin ).ReadUInt16( mpFileHeader->nColorMapYOrigin ).ReadUInt16( mpFileHeader->nImageWidth ). ReadUInt16( mpFileHeader->nImageHeight ).ReadUChar( mpFileHeader->nPixelDepth ).ReadUChar( mpFileHeader->nImageDescriptor );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( mpFileHeader->nColorMapType > 1 )
return sal_False;
return false;
if ( mpFileHeader->nColorMapType == 1 )
mbIndexing = sal_True;
mbIndexing = true;
// first we want to get the version
mpFileFooter = new TGAFileFooter; // read the TGA-File-Footer to determine whether
@@ -201,7 +201,7 @@ sal_Bool TGAReader::ImplReadHeader()
if ( !m_rTGA.good())
return sal_False;
return false;
// check for sal_True, VISI, ON-X, FILE in the signatures
if ( mpFileFooter->nSignature[ 0 ] == (('T'<<24)|('R'<<16)|('U'<<8)|'E') &&
@@ -215,7 +215,7 @@ sal_Bool TGAReader::ImplReadHeader()
m_rTGA.Seek( mpFileFooter->nExtensionFileOffset );
m_rTGA.ReadUInt16( mpExtension->nExtensionSize );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( mpExtension->nExtensionSize >= SizeOfTGAExtension )
{
mnTGAVersion = 2;
@@ -234,7 +234,7 @@ sal_Bool TGAReader::ImplReadHeader()
.ReadUChar( mpExtension->nAttributesType );
if ( !m_rTGA.good())
return sal_False;
return false;
}
}
}
@@ -247,10 +247,10 @@ sal_Bool TGAReader::ImplReadHeader()
mnDestBitDepth = mpFileHeader->nPixelDepth;
if ( mnDestBitDepth == 8 ) // this is a patch for grayscale pictures not including a palette
mbIndexing = sal_True;
mbIndexing = true;
if ( mnDestBitDepth > 32 ) // maybe the pixeldepth is invalid
return sal_False;
return false;
else if ( mnDestBitDepth > 8 )
mnDestBitDepth = 24;
else if ( mnDestBitDepth > 4 )
@@ -259,14 +259,14 @@ sal_Bool TGAReader::ImplReadHeader()
mnDestBitDepth = 4;
if ( !mbIndexing && ( mnDestBitDepth < 15 ) )
return sal_False;
return false;
switch ( mpFileHeader->nImageType )
{
case 9 : // encoding for colortype 9, 10, 11
case 10 :
case 11 :
mbEncoding = sal_True;
mbEncoding = true;
break;
};
@@ -278,7 +278,7 @@ sal_Bool TGAReader::ImplReadHeader()
sal_Bool TGAReader::ImplReadBody()
bool TGAReader::ImplReadBody()
{
sal_uInt16 nXCount, nYCount, nRGB16;
@@ -317,17 +317,17 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nRunCount );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRunCount & 0x80 ) // a run length packet
{
m_rTGA.ReadUInt16( nRGB16 );
if ( nRGB16 >= mpFileHeader->nColorMapLength )
return sal_False;
return false;
nRed = (sal_uInt8)( mpColorMap[ nRGB16 ] >> 16 );
nGreen = (sal_uInt8)( mpColorMap[ nRGB16 ] >> 8 );
nBlue = (sal_uInt8)( mpColorMap[ nRGB16 ] );
if ( !m_rTGA.good())
return sal_False;
return false;
for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
{
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
@@ -351,14 +351,14 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUInt16( nRGB16 );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRGB16 >= mpFileHeader->nColorMapLength )
return sal_False;
return false;
nRed = (sal_uInt8)( mpColorMap[ nRGB16 ] >> 16 );
nGreen = (sal_uInt8)( mpColorMap[ nRGB16 ] >> 8 );
nBlue = (sal_uInt8)( mpColorMap[ nRGB16 ] );
if ( !m_rTGA.good())
return sal_False;
return false;
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
nX += nXAdd;
nXCount++;
@@ -383,14 +383,14 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nRunCount );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRunCount & 0x80 ) // a run length packet
{
m_rTGA.ReadUChar( nDummy );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nDummy >= mpFileHeader->nColorMapLength )
return sal_False;
return false;
for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
{
mpAcc->SetPixelIndex( nY, nX, nDummy );
@@ -415,9 +415,9 @@ sal_Bool TGAReader::ImplReadBody()
m_rTGA.ReadUChar( nDummy );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nDummy >= mpFileHeader->nColorMapLength )
return sal_False;
return false;
mpAcc->SetPixelIndex( nY, nX, nDummy );
nX += nXAdd;
nXCount++;
@@ -436,7 +436,7 @@ sal_Bool TGAReader::ImplReadBody()
}
break;
default:
return sal_False;
return false;
}
}
else
@@ -450,12 +450,12 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nRunCount );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRunCount & 0x80 ) // a run length packet
{
m_rTGA.ReadUChar( nBlue ).ReadUChar( nGreen ).ReadUChar( nRed ).ReadUChar( nDummy );
if ( !m_rTGA.good())
return sal_False;
return false;
for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
{
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
@@ -479,7 +479,7 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nBlue ).ReadUChar( nGreen ).ReadUChar( nRed ).ReadUChar( nDummy );
if ( !m_rTGA.good())
return sal_False;
return false;
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
nX += nXAdd;
nXCount++;
@@ -505,12 +505,12 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nRunCount );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRunCount & 0x80 ) // a run length packet
{
m_rTGA.ReadUChar( nBlue ).ReadUChar( nGreen ).ReadUChar( nRed );
if ( !m_rTGA.good())
return sal_False;
return false;
for ( sal_uInt16 i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
{
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
@@ -534,7 +534,7 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nBlue ).ReadUChar( nGreen ).ReadUChar( nRed );
if ( !m_rTGA.good())
return sal_False;
return false;
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
nX += nXAdd;
nXCount++;
@@ -559,12 +559,12 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nRunCount );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRunCount & 0x80 ) // a run length packet
{
m_rTGA.ReadUInt16( nRGB16 );
if ( !m_rTGA.good())
return sal_False;
return false;
nRed = (sal_uInt8)( nRGB16 >> 7 ) & 0xf8;
nGreen = (sal_uInt8)( nRGB16 >> 2 ) & 0xf8;
nBlue = (sal_uInt8)( nRGB16 << 3 ) & 0xf8;
@@ -591,7 +591,7 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUInt16( nRGB16 );
if ( !m_rTGA.good())
return sal_False;
return false;
nRed = (sal_uInt8)( nRGB16 >> 7 ) & 0xf8;
nGreen = (sal_uInt8)( nRGB16 >> 2 ) & 0xf8;
nBlue = (sal_uInt8)( nRGB16 << 3 ) & 0xf8;
@@ -614,7 +614,7 @@ sal_Bool TGAReader::ImplReadBody()
break;
default:
return sal_False;
return false;
}
}
}
@@ -635,9 +635,9 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUInt16( nRGB16 );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nRGB16 >= mpFileHeader->nColorMapLength )
return sal_False;
return false;
nRed = (sal_uInt8)( mpColorMap[ nRGB16 ] >> 16 );
nGreen = (sal_uInt8)( mpColorMap[ nRGB16 ] >> 8 );
nBlue = (sal_uInt8)( mpColorMap[ nRGB16 ] );
@@ -651,14 +651,14 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nDummy );
if ( !m_rTGA.good())
return sal_False;
return false;
if ( nDummy >= mpFileHeader->nColorMapLength )
return sal_False;
return false;
mpAcc->SetPixelIndex( nY, nX, nDummy );
}
break;
default:
return sal_False;
return false;
}
}
else
@@ -672,7 +672,7 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nBlue ).ReadUChar( nGreen ).ReadUChar( nRed ).ReadUChar( nDummy );
if ( !m_rTGA.good())
return sal_False;
return false;
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
}
}
@@ -684,7 +684,7 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUChar( nBlue ).ReadUChar( nGreen ).ReadUChar( nRed );
if ( !m_rTGA.good())
return sal_False;
return false;
mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
}
break;
@@ -695,7 +695,7 @@ sal_Bool TGAReader::ImplReadBody()
{
m_rTGA.ReadUInt16( nRGB16 );
if ( !m_rTGA.good())
return sal_False;
return false;
nRed = (sal_uInt8)( nRGB16 >> 7 ) & 0xf8;
nGreen = (sal_uInt8)( nRGB16 >> 2 ) & 0xf8;
nBlue = (sal_uInt8)( nRGB16 << 3 ) & 0xf8;
@@ -703,7 +703,7 @@ sal_Bool TGAReader::ImplReadBody()
}
break;
default:
return sal_False;
return false;
}
}
}
@@ -713,7 +713,7 @@ sal_Bool TGAReader::ImplReadBody()
sal_Bool TGAReader::ImplReadPalette()
bool TGAReader::ImplReadPalette()
{
if ( mbIndexing ) // read the colormap
{
@@ -722,7 +722,7 @@ sal_Bool TGAReader::ImplReadPalette()
if ( !nColors ) // colors == 0 ? -> we will build a grayscale palette
{
if ( mpFileHeader->nPixelDepth != 8 )
return sal_False;
return false;
nColors = 256;
mpFileHeader->nColorMapLength = 256;
mpFileHeader->nColorMapEntrySize = 0x3f; // patch for the following switch routine
@@ -761,7 +761,7 @@ sal_Bool TGAReader::ImplReadPalette()
sal_uInt16 nTemp;
m_rTGA.ReadUInt16( nTemp );
if ( !m_rTGA.good() )
return sal_False;
return false;
mpColorMap[ i ] = ( ( nTemp & 0x7c00 ) << 9 ) + ( ( nTemp & 0x01e0 ) << 6 ) +
( ( nTemp & 0x1f ) << 3 );
}
@@ -769,13 +769,13 @@ sal_Bool TGAReader::ImplReadPalette()
break;
default :
return sal_False;
return false;
}
if ( mnDestBitDepth <= 8 )
{
sal_uInt16 nDestColors = ( 1 << mnDestBitDepth );
if ( nColors > nDestColors )
return sal_False;
return false;
mpAcc->SetPaletteEntryCount( nColors );
for ( sal_uInt16 i = 0; i < nColors; i++ )
diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx
index 1d105b2..6a7a144ef 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.cxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.cxx
@@ -566,8 +566,8 @@ const CCIHuffmanTableEntry CCIUncompTableSave[CCIUncompTableSize]={
CCIDecompressor::CCIDecompressor( sal_uLong nOpts, sal_uInt32 nImageWidth ) :
bTableBad ( sal_False ),
bStatus ( sal_False ),
bTableBad ( false ),
bStatus ( false ),
pByteSwap ( NULL ),
pIStream ( NULL ),
nWidth ( nImageWidth ),
@@ -612,26 +612,26 @@ void CCIDecompressor::StartDecompression( SvStream & rIStream )
{
pIStream = &rIStream;
nInputBitsBufSize = 0;
bFirstEOL = sal_True;
bStatus = sal_True;
bFirstEOL = true;
bStatus = true;
nEOLCount = 0;
if ( bTableBad == sal_True )
if ( bTableBad )
return;
}
sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine )
bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine )
{
sal_uInt16 i;
sal_uInt8 * pDst;
sal_Bool b2D;
bool b2D;
if ( nEOLCount >= 5 ) // RTC (Return To Controller)
return sal_True;
return true;
if ( bStatus == sal_False )
return sal_False;
if ( bStatus == false )
return false;
// If EOL-Codes exist, the EOL-Code also appeared in front of the first line.
// (and I thought it means 'End of Line'...)
@@ -643,18 +643,18 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa
sal_uInt32 nCurPos = pIStream->Tell();
sal_uInt16 nOldInputBitsBufSize = nInputBitsBufSize;
sal_uInt32 nOldInputBitsBuf = nInputBitsBuf;
if ( ReadEOL( 32 ) == sal_False )
if ( ReadEOL( 32 ) == false )
{
nInputBitsBufSize = nOldInputBitsBufSize;
nInputBitsBuf = nOldInputBitsBuf;
pIStream->Seek( nCurPos );
nOptions &=~ CCI_OPTION_EOL; // CCITT Group 3 - Compression Type 2
}
bFirstEOL = sal_False;
bFirstEOL = false;
}
else
{
if ( ReadEOL( nTargetBits ) == sal_False )
if ( ReadEOL( nTargetBits ) == false )
{
return bStatus;
}
@@ -662,7 +662,7 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa
}
if ( nEOLCount >= 5 ) // RTC (Return To Controller)
return sal_True;
return true;
// should the situation arise, generate a white previous line for 2D:
if ( nOptions & CCI_OPTION_2D )
@@ -687,10 +687,10 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa
if ( nOptions & CCI_OPTION_EOL )
b2D = Read2DTag();
else
b2D = sal_True;
b2D = true;
}
else
b2D = sal_False;
b2D = false;
// read scanline:
if ( b2D )
@@ -699,7 +699,7 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa
Read1DScanlineData( pTarget, (sal_uInt16)nTargetBits );
// if we're in 2D mode we have to remember the line:
if ( nOptions & CCI_OPTION_2D && bStatus == sal_True )
if ( nOptions & CCI_OPTION_2D && bStatus )
{
sal_uInt8 *pSrc = pTarget;
pDst = pLastLine;
@@ -709,11 +709,11 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa
// #i122984#
if( !bStatus && bLastLine )
{
bStatus = sal_True;
bStatus = true;
}
if ( pIStream->GetError() )
bStatus = sal_False;
bStatus = false;
return bStatus;
}
@@ -728,7 +728,7 @@ void CCIDecompressor::MakeLookUp(const CCIHuffmanTableEntry * pHufTab,
sal_uInt16 nLookUpSize = 1 << nMaxCodeBits;
memset(pLookUp, 0, nLookUpSize * sizeof(CCILookUpTableEntry));
if (bTableBad==sal_True)
if (bTableBad)
return;
sal_uInt16 nMask = 0xffff >> (16-nMaxCodeBits);
@@ -741,7 +741,7 @@ void CCIDecompressor::MakeLookUp(const CCIHuffmanTableEntry * pHufTab,
pHufTab[i].nCodeBits==0 ||
pHufTab[i].nCodeBits>nMaxCodeBits )
{
bTableBad=sal_True;
bTableBad=true;
return;
}
sal_uInt16 nMinCode = nMask & (pHufTab[i].nCode << (nMaxCodeBits-pHufTab[i].nCodeBits));
@@ -750,7 +750,7 @@ void CCIDecompressor::MakeLookUp(const CCIHuffmanTableEntry * pHufTab,
{
if (pLookUp[j].nCodeBits!=0)
{
bTableBad=sal_True;
bTableBad=true;
return;
}
pLookUp[j].nValue=pHufTab[i].nValue;
@@ -760,7 +760,7 @@ void CCIDecompressor::MakeLookUp(const CCIHuffmanTableEntry * pHufTab,
}
sal_Bool CCIDecompressor::ReadEOL( sal_uInt32 /*nMaxFillBits*/ )
bool CCIDecompressor::ReadEOL( sal_uInt32 /*nMaxFillBits*/ )
{
sal_uInt16 nCode;
sal_uInt8 nByte;
@@ -781,9 +781,9 @@ sal_Bool CCIDecompressor::ReadEOL( sal_uInt32 /*nMaxFillBits*/ )
{
pIStream->ReadUChar( nByte );
if ( pIStream->IsEof() )
return sal_False;
return false;
if ( pIStream->Tell() > nMaxPos )
return sal_False;
return false;
if ( nOptions & CCI_OPTION_INVERSEBITORDER )
nByte = pByteSwap[ nByte ];
@@ -800,11 +800,11 @@ sal_Bool CCIDecompressor::ReadEOL( sal_uInt32 /*nMaxFillBits*/ )
else
nInputBitsBufSize--;
}
return sal_True;
return true;
}
sal_Bool CCIDecompressor::Read2DTag()
bool CCIDecompressor::Read2DTag()
{
sal_uInt8 nByte;
@@ -817,8 +817,8 @@ sal_Bool CCIDecompressor::Read2DTag()
nInputBitsBufSize=8;
}
nInputBitsBufSize--;
if ( ((nInputBitsBuf>>nInputBitsBufSize)&0x0001) ) return sal_False;
else return sal_True;
if ( ((nInputBitsBuf>>nInputBitsBufSize)&0x0001) ) return false;
else return true;
}
@@ -856,7 +856,7 @@ sal_uInt16 CCIDecompressor::ReadCodeAndDecode(const CCILookUpTableEntry * pLookU
sal_uInt16 nCode = (sal_uInt16)((nInputBitsBuf>>(nInputBitsBufSize-nMaxCodeBits))
&(0xffff>>(16-nMaxCodeBits)));
sal_uInt16 nCodeBits = pLookUp[nCode].nCodeBits;
if (nCodeBits==0) bStatus=sal_False;
if (nCodeBits==0) bStatus=false;
nInputBitsBufSize = nInputBitsBufSize - nCodeBits;
return pLookUp[nCode].nValue;
}
@@ -921,7 +921,7 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget
sal_uInt16 nCode,nCodeBits,nDataBits,nTgtFreeByteBits;
sal_uInt8 nByte;
sal_uInt8 nBlackOrWhite; // is 0xff for black or 0x00 for white
sal_Bool bTerminatingCode;
bool bTerminatingCode;
// the first code is always a "white-code":
nBlackOrWhite=0x00;
@@ -970,7 +970,7 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget
}
// is that a 'Terminating-Code'?
if (nDataBits<64) bTerminatingCode=sal_True; else bTerminatingCode=sal_False;
if (nDataBits<64) bTerminatingCode=true; else bTerminatingCode=false;
// remove the read bits from the input buffer:
nInputBitsBufSize = nInputBitsBufSize - nCodeBits;
@@ -1003,9 +1003,9 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget
}
// should the situation arise, switch Black <-> White:
if (bTerminatingCode==sal_True) nBlackOrWhite=~nBlackOrWhite;
if (bTerminatingCode) nBlackOrWhite = ~nBlackOrWhite;
} while (nTargetBits>0 || bTerminatingCode==sal_False);
} while (nTargetBits>0 || bTerminatingCode==false);
}
@@ -1018,10 +1018,10 @@ void CCIDecompressor::Read2DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget
nBlackOrWhite=0x00;
nBitPos=0;
while (nBitPos<nTargetBits && bStatus==sal_True) {
while (nBitPos<nTargetBits && bStatus) {
n2DMode=ReadCodeAndDecode(p2DModeLookUp,10);
if (bStatus==sal_False) return;
if (bStatus==false) return;
if (n2DMode==CCI2DMODE_UNCOMP) {
for (;;) {
diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx
index e018dcf..0e57ea8 100644
--- a/filter/source/graphicfilter/itiff/ccidecom.hxx
+++ b/filter/source/graphicfilter/itiff/ccidecom.hxx
@@ -53,7 +53,7 @@ public:
void StartDecompression( SvStream & rIStream );
sal_Bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine );
bool DecompressScanline(sal_uInt8 * pTarget, sal_uLong nTargetBits, bool bLastLine );
private:
@@ -63,9 +63,9 @@ private:
sal_uInt16 nHuffmanTableSize,
sal_uInt16 nMaxCodeBits);
sal_Bool ReadEOL( sal_uInt32 nMaxFillBits );
bool ReadEOL( sal_uInt32 nMaxFillBits );
sal_Bool Read2DTag();
bool Read2DTag();
sal_uInt8 ReadBlackOrWhite();
@@ -83,9 +83,9 @@ private:
void Read2DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTargetBits);
sal_Bool bTableBad;
bool bTableBad;
sal_Bool bStatus;
bool bStatus;
sal_uInt8* pByteSwap;
@@ -97,7 +97,7 @@ private:
sal_uLong nOptions;
sal_Bool bFirstEOL;
bool bFirstEOL;
CCILookUpTableEntry * pWhiteLookUp;
CCILookUpTableEntry * pBlackLookUp;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 03c324c..061592b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -43,7 +43,7 @@ class TIFFReader
private:
sal_Bool bStatus; // Whether until now no error occurred
bool bStatus; // Whether until now no error occurred
Animation aAnimation;
sal_uLong nLastPercent;
@@ -60,7 +60,7 @@ private:
sal_uInt16 nDataType;
// Data taken from the TIFF tags:
sal_Bool bByteSwap; // sal_True if bits 0..7 -> 7..0 should get converted ( FILLORDER = 2 );
bool bByteSwap; // sal_True if bits 0..7 -> 7..0 should get converted ( FILLORDER = 2 );
sal_uLong nNewSubFile;
sal_uLong nSubFile;
@@ -107,7 +107,7 @@ private:
void ReadHeader();
void ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen );
sal_Bool ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent );
bool ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent );
// reads/decompresses the bitmap data and fills pMap
sal_uLong GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_uLong nBitsCount );
@@ -117,7 +117,7 @@ private:
// Create the bitmap from the temporary bitmap pMap
// and partly deletes pMap while doing this.
sal_Bool ConvertScanline( sal_uLong nY );
bool ConvertScanline( sal_uLong nY );
// converts a Scanline to the Windows-BMP format
bool HasAlphaChannel() const;
@@ -301,7 +301,7 @@ double TIFFReader::ReadDoubleData()
void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
{
if ( bStatus == sal_False )
if ( bStatus == false )
return;
switch ( nTagType )
@@ -330,7 +330,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
nBitsPerSample = ReadIntData();
SAL_INFO("filter.tiff","BitsPerSample: " << nBitsPerSample);
if ( nBitsPerSample >= 32 ) // 32 bit and larger samples are not supported
bStatus = sal_False;
bStatus = false;
break;
case 0x0103: // Compression
@@ -506,7 +506,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
}
}
else
bStatus = sal_False;
bStatus = false;
SAL_INFO("filter.tiff","ColorMap (number of colors): " << nNumColors);
break;
}
@@ -514,18 +514,18 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
case 0x0153: { // SampleFormat
sal_uLong nSampleFormat = ReadIntData();
if ( nSampleFormat == 3 ) // IEEE floating point samples are not supported yet
bStatus = sal_False;
bStatus = false;
break;
}
}
if ( pTIFF->GetError() )
bStatus = sal_False;
bStatus = false;
}
sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
{
if ( nCompression == 1 || nCompression == 32771 )
{
@@ -541,15 +541,15 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
{
nStrip = ny / nRowsPerStrip + np * nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek( pStripOffsets[ nStrip ] + ( ny % nRowsPerStrip ) * nStripBytesPerRow );
pTIFF->Read( pMap[ np ], nBytesPerRow );
if ( pTIFF->GetError() )
return sal_False;
return false;
MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * ( np * nImageLength + ny) / ( nImageLength * nPlanes ) );
}
if ( !ConvertScanline( ny ) )
return sal_False;
return false;
}
}
else if ( nCompression == 2 || nCompression == 3 || nCompression == 4 )
@@ -567,22 +567,22 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
if ( nGroup3Options & 0x00000004 )
nOptions |= CCI_OPTION_BYTEALIGNEOL;
if ( nGroup3Options & 0xfffffffa )
return sal_False;
return false;
}
else
{ // nCompression==4
nOptions = CCI_OPTION_2D;
if ( nGroup4Options & 0xffffffff )
return sal_False;
return false;
}
if ( nFillOrder == 2 )
{
nOptions |= CCI_OPTION_INVERSEBITORDER;
bByteSwap = sal_False;
bByteSwap = false;
}
nStrip = 0;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
CCIDecompressor aCCIDecom( nOptions, nImageWidth );
@@ -597,18 +597,18 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
{
nStrip=ny/nRowsPerStrip+np*nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek( pStripOffsets[ nStrip ] );
aCCIDecom.StartDecompression( *pTIFF );
}
if ( aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes, np + 1 == nPlanes ) == sal_False )
return sal_False;
if ( aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes, np + 1 == nPlanes ) == false )
return false;
if ( pTIFF->GetError() )
return sal_False;
return false;
MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
}
if ( !ConvertScanline( ny ) )
return sal_False;
return false;
}
}
else if ( nCompression == 5 )
@@ -617,7 +617,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
sal_uLong ny, np, nStrip;
nStrip=0;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
aLZWDecom.StartDecompression(*pTIFF);
for ( ny = 0; ny < nImageLength; ny++ )
@@ -628,16 +628,16 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
{
nStrip = ny / nRowsPerStrip + np * nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
aLZWDecom.StartDecompression(*pTIFF);
}
if ( ( aLZWDecom.Decompress( pMap[ np ], nBytesPerRow ) != nBytesPerRow ) || pTIFF->GetError() )
return sal_False;
return false;
MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
}
if ( !ConvertScanline( ny ) )
return sal_False;
return false;
}
}
else if ( nCompression == 32773 )
@@ -646,7 +646,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
sal_uInt8 * pdst;
nStrip = 0;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
for ( ny = 0; ny < nImageLength; ny++ )
{
@@ -656,7 +656,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
{
nStrip=ny/nRowsPerStrip+np*nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return sal_False;
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
}
nRowBytesLeft = nBytesPerRow;
@@ -669,7 +669,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
{
nRecCount=0x00000001+((sal_uLong)nRecHeader);
if ( nRecCount > nRowBytesLeft )
return sal_False;
return false;
pTIFF->Read(pdst,nRecCount);
pdst+=nRecCount;
nRowBytesLeft-=nRecCount;
@@ -693,16 +693,16 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
}
} while ( nRowBytesLeft != 0 );
if ( pTIFF->GetError() )
return sal_False;
return false;
MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
}
if ( !ConvertScanline( ny ) )
return sal_False;
return false;
}
}
else
return sal_False;
return sal_True;
return false;
return true;
}
sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_uLong nBitsCount )
@@ -763,7 +763,7 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_u
sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
bool TIFFReader::ConvertScanline( sal_uLong nY )
{
sal_uInt32 nRed, nGreen, nBlue, ns, nx, nVal, nByteCount;
sal_uInt8 nByteVal;
@@ -1046,7 +1046,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
break;
default :
return sal_False;
return false;
}
}
}
@@ -1064,8 +1064,8 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
}
}
else
return sal_False;
return sal_True;
return false;
return true;
}
@@ -1134,7 +1134,7 @@ void TIFFReader::ReadHeader()
pTIFF->ReadUChar( nbyte2 ).ReadUInt16( nushort );
if ( nbyte1 != nbyte2 || ( nbyte1 != 'I' && nbyte1 != 'M' ) || nushort != 0x002a )
bStatus = sal_False;
bStatus = false;
}
bool TIFFReader::HasAlphaChannel() const
@@ -1158,7 +1158,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
sal_uLong nPos;
sal_uInt32 nFirstIfd(0), nDataLen;
bStatus = sal_True;
bStatus = true;
nLastPercent = 0;
pTIFF = &rTIFF;
@@ -1174,7 +1174,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
pTIFF->ReadUInt32( nFirstIfd );
if( !nFirstIfd || pTIFF->GetError() )
bStatus = sal_False;
bStatus = false;
if ( bStatus )
{
@@ -1216,7 +1216,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
{
pTIFF->Seek( nOrigPos + nNextIfd );
{
bByteSwap = sal_False;
bByteSwap = false;
nNewSubFile = 0;
nSubFile = 0;
@@ -1268,9 +1268,9 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
nPos += 12; pTIFF->Seek( nPos );
if ( pTIFF->GetError() )
bStatus = sal_False;
bStatus = false;
if ( bStatus == sal_False )
if ( bStatus == false )
break;
}
pTIFF->ReadUInt32( nNextIfd );
@@ -1278,7 +1278,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
nNextIfd = 0;
}
if ( !nBitsPerSample || ( nBitsPerSample > 32 ) )
bStatus = sal_False;
bStatus = false;
if ( bStatus )
{
if ( nMaxSampleValue == 0 )
@@ -1308,7 +1308,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
nPlanes = nSamplesPerPixel;
if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) // in the LZW mode bits are already being inverted
bByteSwap = sal_True;
bByteSwap = true;
nStripsPerPlane = ( nImageLength - 1 ) / nRowsPerStrip + 1;
nBytesPerRow = ( nImageWidth * nSamplesPerPixel / nPlanes * nBitsPerSample + 7 ) >> 3;
@@ -1322,7 +1322,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
catch (const std::bad_alloc &)
{
pMap[ j ] = NULL;
bStatus = sal_False;
bStatus = false;
break;
}
}
@@ -1340,7 +1340,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
nMaxPos = std::max( pTIFF->Tell(), nMaxPos );
}
else
bStatus = sal_False;
bStatus = false;
if( pAcc )
{
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index cb8abaa..82f6acc 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -60,7 +60,7 @@ void LZWDecompressor::StartDecompression(SvStream & rIStream)
nTableSize=258;
bEOIFound=sal_False;
bEOIFound=false;
nOutBufDataLen=0;
@@ -71,7 +71,7 @@ void LZWDecompressor::StartDecompression(SvStream & rIStream)
if ( bFirst )
{
bInvert = nInputBitsBuf == 1;
bFirst = sal_False;
bFirst = false;
}
if ( bInvert )
@@ -107,7 +107,7 @@ sal_uLong LZWDecompressor::Decompress(sal_uInt8 * pTarget, sal_uLong nMaxCount)
nOutBufDataLen--;
}
if (bEOIFound==sal_True) break;
if (bEOIFound) break;
DecompressSome();
@@ -157,7 +157,7 @@ void LZWDecompressor::AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData
//It might be possible to force emit a 256 to flush the buffer and try
//to continue later?
SAL_WARN("filter.tiff", "Too much data at scanline");
bEOIFound = sal_True;
bEOIFound = true;
return;
}
@@ -183,7 +183,7 @@ void LZWDecompressor::DecompressSome()
nCode=GetNextCode();
if (nCode==257)
{
bEOIFound=sal_True;
bEOIFound=true;
}
}
else if (nCode<nTableSize)
@@ -192,7 +192,7 @@ void LZWDecompressor::DecompressSome()
AddToTable(nOldCode,nOldCode);
else
{
bEOIFound=sal_True;
bEOIFound=true;
}
if (bEOIFound)
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx
index a5afdca..bce76b5 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.hxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx
@@ -52,7 +52,7 @@ private:
LZWTableEntry * pTable;
sal_uInt16 nTableSize;
sal_Bool bEOIFound, bInvert, bFirst;
bool bEOIFound, bInvert, bFirst;
sal_uInt16 nOldCode;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index db1473f..2dea549 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -668,11 +668,11 @@ void EscherPropertyContainer::CreateTextProperties(
sal_Int32 nBottom ( 0 );
// used with normal shapes:
sal_Bool bAutoGrowWidth ( sal_False );
sal_Bool bAutoGrowHeight ( sal_False );
bool bAutoGrowWidth ( false );
bool bAutoGrowHeight ( false );
// used with ashapes:
sal_Bool bWordWrap ( sal_False );
sal_Bool bAutoGrowSize ( sal_False );
bool bWordWrap ( false );
bool bAutoGrowSize ( false );
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWritingMode" ), true ) )
aAny >>= eWM;
@@ -855,7 +855,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
const OUString sLine ( bLineStart ? sLineStart : sLineEnd );
const OUString sLineName ( bLineStart ? sLineStartName : sLineEndName );
sal_Bool bIsArrow = sal_False;
bool bIsArrow = false;
::com::sun::star::uno::Any aAny;
if ( EscherPropertyValueHelper::GetPropertyValue(
@@ -864,7 +864,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) );
if ( aPolyPoly.Count() && aPolyPoly[ 0 ].GetSize() )
{
bIsArrow = sal_True;
bIsArrow = true;
reLineEnd = ESCHER_LineArrowEnd;
rnArrowLength = 1;
@@ -877,7 +877,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND;
OUString aApiName = SvxUnogetApiNameForItem(nWhich, aArrowStartName);
sal_Bool bIsMapped = sal_True;
bool bIsMapped = true;
if ( !aApiName.isEmpty() )
{
@@ -911,12 +911,12 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
else if ( aApiName == "Arrow" )
reLineEnd = ESCHER_LineArrowEnd;
else
bIsMapped = sal_False;
bIsMapped = false;
}
if ( !bIsMapped && comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 )
{
sal_Bool b = sal_True;
bool b = true;
OUString aArrowName( aArrowStartName.getToken( 0, ' ' ) );
if ( aArrowName == "msArrowEnd" )
reLineEnd = ESCHER_LineArrowEnd;
@@ -929,7 +929,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart,
else if ( aArrowName == "msArrowOvalEnd" )
reLineEnd = ESCHER_LineArrowOvalEnd;
else
b = sal_False;
b = false;
// now we have the arrow, and try to determine the arrow size;
if ( b )
@@ -957,14 +957,14 @@ void EscherPropertyContainer::CreateLineProperties(
sal_Int32 nArrowLength;
sal_Int32 nArrowWidth;
sal_Bool bSwapLineEnds = sal_False;
bool bSwapLineEnds = false;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "CircleKind" ), true ) )
{
::com::sun::star::drawing::CircleKind eCircleKind;
if ( aAny >>= eCircleKind )
{
if ( eCircleKind == ::com::sun::star::drawing::CircleKind_ARC )
bSwapLineEnds = sal_True;
bSwapLineEnds = true;
}
}
if ( GetLineArrow( bSwapLineEnds ? sal_False : sal_True, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) )
@@ -1245,7 +1245,7 @@ bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno
uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
if ( aXPropSet.is() )
{
sal_Bool bVal = false;
bool bVal = false;
::com::sun::star::uno::Any aAny;
sal_uInt32 nShapeAttr = 0;
EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "Visible" ), true );
@@ -1430,10 +1430,10 @@ bool EscherPropertyContainer::CreateGraphicProperties(
const bool bFillBitmapModeAllowed, const bool bOOxmlExport )
{
bool bRetValue = false;
sal_Bool bCreateFillStyles = sal_False;
bool bCreateFillStyles = false;
sal_Bool bMirrored = sal_False;
sal_Bool bRotate = sal_True;
bool bMirrored = false;
bool bRotate = true;
boost::scoped_ptr<GraphicAttr> pGraphicAttr;
GraphicObject aGraphicObject;
OUString aGraphicUrl;
@@ -1459,7 +1459,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
sal_uInt32 nAryLen = aSeq.getLength();
// the metafile is already rotated
bRotate = sal_False;
bRotate = false;
if ( pAry && nAryLen )
{
@@ -1498,7 +1498,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
else if ( rSource == "GraphicURL" )
{
aGraphicUrl = *(OUString*)aAny.getValue();
bCreateFillStyles = sal_True;
bCreateFillStyles = true;
}
else if ( rSource == "FillHatch" )
{
@@ -1787,7 +1787,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno
if ( aAny >>= aXPropSet )
{
sal_Bool bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygonBezier, true );
bool bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygonBezier, true );
if ( !bHasProperty )
bHasProperty = EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sPolyPolygon, true );
if ( !bHasProperty )
@@ -1802,7 +1802,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno
PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Any& rAny )
{
sal_Bool bNoError = sal_True;
bool bNoError = true;
Polygon aPolygon;
PolyPolygon aPolyPolygon;
@@ -2021,7 +2021,7 @@ bool EscherPropertyContainer::CreatePolygonProperties(
static OUString sPolyPolygon ( "PolyPolygon" );
bool bRetValue = true;
sal_Bool bLine = ( nFlags & ESCHER_CREATEPOLYGON_LINE ) != 0;
bool bLine = ( nFlags & ESCHER_CREATEPOLYGON_LINE ) != 0;
PolyPolygon aPolyPolygon;
@@ -2208,7 +2208,7 @@ sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex
if ( aEnd.X() == aStart.X() )
aEnd.X() = aStart.X() +4;
sal_Bool bVertical = ( rPoly[1].X()-aStart.X() ) == 0 ;
bool bVertical = ( rPoly[1].X()-aStart.X() ) == 0 ;
// vertical and horizon alternate
if ( nIndex%2 == 1 ) bVertical = !bVertical;
aPt = rPoly[ nIndex + 1];
@@ -2433,7 +2433,7 @@ bool EscherPropertyContainer::CreateShadowProperties(
{
::com::sun::star::uno::Any aAny;
sal_Bool bHasShadow = sal_False; // shadow is possible only if at least a fillcolor, linecolor or graphic is set
bool bHasShadow = false; // shadow is possible only if at least a fillcolor, linecolor or graphic is set
sal_uInt32 nLineFlags = 0; // default : shape has no line
sal_uInt32 nFillFlags = 0x10; // shape is filled
@@ -2441,7 +2441,7 @@ bool EscherPropertyContainer::CreateShadowProperties(
GetOpt( ESCHER_Prop_fNoFillHitTest, nFillFlags );
sal_uInt32 nDummy;
sal_Bool bGraphic = GetOpt( DFF_Prop_pib, nDummy ) || GetOpt( DFF_Prop_pibName, nDummy ) || GetOpt( DFF_Prop_pibFlags, nDummy );
bool bGraphic = GetOpt( DFF_Prop_pib, nDummy ) || GetOpt( DFF_Prop_pibName, nDummy ) || GetOpt( DFF_Prop_pibFlags, nDummy );
sal_uInt32 nShadowFlags = 0x20000;
if ( ( nLineFlags & 8 ) || ( nFillFlags & 0x10 ) || bGraphic )
@@ -2500,7 +2500,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons
if(bAdjustTrans)
{
sal_uInt32 nAdjustValue = 0;
sal_Bool bGot = GetOpt((sal_uInt16)( DFF_Prop_adjustValue + nValue ), nAdjustValue);
bool bGot = GetOpt((sal_uInt16)( DFF_Prop_adjustValue + nValue ), nAdjustValue);
if(bGot) nValue = (sal_Int32)nAdjustValue;
}
}
@@ -2521,7 +2521,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons
bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
{
sal_Bool bSpecial = sal_False;
bool bSpecial = false;
nRetValue = 0;
if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
{
@@ -2537,27 +2537,27 @@ bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const
case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
nRetValue += 3;
bSpecial = sal_True;
bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
{
nRetValue += 0x100;
bSpecial = sal_True;
bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP :
case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT :
{
nRetValue = 0;
bSpecial = sal_True;
bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT :
case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM :
{
nRetValue = 1;
bSpecial = sal_True;
bSpecial = true;
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
@@ -2651,7 +2651,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType )
{
sal_Bool bIsDefaultObject = sal_False;
bool bIsDefaultObject = false;
switch(eShapeType)
{
// if the custom shape is not default shape of ppt, return sal_Fasle;
@@ -2672,7 +2672,7 @@ bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape ,
&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHX )
&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHY )
&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_TEXTFRAMES ) )
bIsDefaultObject = sal_True;
bIsDefaultObject = true;
}
return bIsDefaultObject;
@@ -2701,7 +2701,7 @@ bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing:
if ( rkProp.State != beans::PropertyState_DIRECT_VALUE )
return false;
sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0;
bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0;
if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
{
double fValue(0.0);
@@ -2748,8 +2748,8 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
sal_Bool bPredefinedHandlesUsed = sal_True;
sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape , eShapeType);
bool bPredefinedHandlesUsed = true;
bool bIsDefaultObject = IsDefaultObject( pCustoShape , eShapeType);
// convert property "Equations" into std::vector< EnhancedCustomShapeEquationEquation >
std::vector< EnhancedCustomShapeEquation > aEquations;
@@ -2833,7 +2833,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( rrProp.Name.equals( sExtrusion ) )
{
sal_Bool bExtrusionOn = sal_Bool();
bool bExtrusionOn;
if ( rrProp.Value >>= bExtrusionOn )
{
nLightFaceFlags |= 0x80000;
@@ -2883,7 +2883,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sExtrusionLightFace ) )
{
sal_Bool bExtrusionLightFace = sal_Bool();
bool bExtrusionLightFace;
if ( rrProp.Value >>= bExtrusionLightFace )
{
nLightFaceFlags |= 0x10000;
@@ -2895,7 +2895,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sExtrusionFirstLightHarsh ) )
{
sal_Bool bExtrusionFirstLightHarsh = sal_Bool();
bool bExtrusionFirstLightHarsh;
if ( rrProp.Value >>= bExtrusionFirstLightHarsh )
{
nFillHarshFlags |= 0x20000;
@@ -2907,7 +2907,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sExtrusionSecondLightHarsh ) )
{
sal_Bool bExtrusionSecondLightHarsh = sal_Bool();
bool bExtrusionSecondLightHarsh;
if ( rrProp.Value >>= bExtrusionSecondLightHarsh )
{
nFillHarshFlags |= 0x10000;
@@ -2951,7 +2951,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sExtrusionMetal ) )
{
sal_Bool bExtrusionMetal = sal_Bool();
bool bExtrusionMetal;
if ( rrProp.Value >>= bExtrusionMetal )
{
nLightFaceFlags |= 0x40000;
@@ -3069,7 +3069,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sExtrusionColor ) )
{
sal_Bool bExtrusionColor = sal_Bool();
bool bExtrusionColor;
if ( rrProp.Value >>= bExtrusionColor )
{
nLightFaceFlags |= 0x20000;
@@ -3156,7 +3156,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( rrProp.Name.equals( sPathExtrusionAllowed ) )
{
sal_Bool bExtrusionAllowed = sal_Bool();
bool bExtrusionAllowed;
if ( rrProp.Value >>= bExtrusionAllowed )
{
nPathFlags |= 0x100000;
@@ -3168,7 +3168,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sPathConcentricGradientFillAllowed ) )
{
sal_Bool bConcentricGradientFillAllowed = sal_Bool();
bool bConcentricGradientFillAllowed;
if ( rrProp.Value >>= bConcentricGradientFillAllowed )
{
nPathFlags |= 0x20000;
@@ -3180,7 +3180,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sPathTextPathAllowed ) )
{
sal_Bool bTextPathAllowed = sal_Bool();
bool bTextPathAllowed;
if ( rrProp.Value >>= bTextPathAllowed )
{
nPathFlags |= 0x40000;
@@ -3438,7 +3438,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( rrProp.Name.equals( sTextPath ) )
{
sal_Bool bTextPathOn = sal_Bool();
bool bTextPathOn;
if ( rrProp.Value >>= bTextPathOn )
{
nTextPathFlags |= 0x40000000;
@@ -3470,7 +3470,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sTextPathScaleX ) )
{
sal_Bool bTextPathScaleX = sal_Bool();
bool bTextPathScaleX;
if ( rrProp.Value >>= bTextPathScaleX )
{
nTextPathFlags |= 0x00400000;
@@ -3482,7 +3482,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rrProp.Name.equals( sSameLetterHeights ) )
{
sal_Bool bSameLetterHeights = sal_Bool();
bool bSameLetterHeights;
if ( rrProp.Value >>= bSameLetterHeights )
{
nTextPathFlags |= 0x00800000;
@@ -3620,7 +3620,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
if ( !bIsDefaultObject )
{
bPredefinedHandlesUsed = sal_False;
bPredefinedHandlesUsed = false;
if ( rProp.Value >>= aHandlesPropSeq )
{
sal_uInt16 nElements = (sal_uInt16)aHandlesPropSeq.getLength();
@@ -3673,7 +3673,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rPropVal.Name.equals( sMirroredX ) )
{
sal_Bool bMirroredX = sal_Bool();
bool bMirroredX;
if ( rPropVal.Value >>= bMirroredX )
{
if ( bMirroredX )
@@ -3682,7 +3682,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rPropVal.Name.equals( sMirroredY ) )
{
sal_Bool bMirroredY = sal_Bool();
bool bMirroredY;
if ( rPropVal.Value >>= bMirroredY )
{
if ( bMirroredY )
@@ -3691,7 +3691,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
else if ( rPropVal.Name.equals( sSwitched ) )
{
sal_Bool bSwitched = sal_Bool();
bool bSwitched;
if ( rPropVal.Value >>= bSwitched )
{
if ( bSwitched )
@@ -3899,13 +3899,13 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
}
else if ( rProp.Name == "MirroredX" )
{
sal_Bool bMirroredX = sal_Bool();
bool bMirroredX;
if ( ( rProp.Value >>= bMirroredX ) && bMirroredX )
nMirrorFlags |= SHAPEFLAG_FLIPH;
}
else if ( rProp.Name == "MirroredY" )
{
sal_Bool bMirroredY = sal_Bool();
bool bMirroredY;
if ( ( rProp.Value >>= bMirroredY ) && bMirroredY )
nMirrorFlags |= SHAPEFLAG_FLIPV;
}
@@ -4348,7 +4348,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
}
}
sal_Bool bUseNativeGraphic( sal_False );
bool bUseNativeGraphic( false );
Graphic aGraphic( aGraphicObject.GetTransformedGraphic( pGraphicAttr ) );
GfxLink aGraphicLink;
@@ -4403,7 +4403,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin
default: break;
}
if ( p_EscherBlibEntry->meBlibType != UNKNOWN )
bUseNativeGraphic = sal_True;
bUseNativeGraphic = true;
}
}
if ( !bUseNativeGraphic )
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index e4e4507..0fd59db 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -177,12 +177,12 @@ void ImplEESdrWriter::MapRect(ImplEESdrObject& /* rObj */ )
sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolverContainer,
ImplEESdrPageType ePageType, const sal_Bool bOOxmlExport )
ImplEESdrPageType ePageType, const bool bOOxmlExport )
{
sal_uInt32 nShapeID = 0;
sal_uInt16 nShapeType = 0;
sal_Bool bDontWriteText = sal_False; // if a metafile is written as shape replacement, then the text is already part of the metafile
sal_Bool bAdditionalText = sal_False;
bool bDontWriteText = false; // if a metafile is written as shape replacement, then the text is already part of the metafile
bool bAdditionalText = false;
sal_uInt32 nGrpShapeID = 0;
do {
@@ -304,7 +304,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
Size aSize( ImplMapSize( aBound.GetSize() ) );
rObj.SetRect( Rectangle( aPosition, aSize ) );
rObj.SetAngle( 0 );
bDontWriteText = sal_True;
bDontWriteText = true;
}
}
}
@@ -494,7 +494,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if( rObj.ImplHasText() )
{
nGrpShapeID = ImplEnterAdditionalTextGroup( rObj.GetShapeRef(), &rObj.GetRect() );
bAdditionalText = sal_True;
bAdditionalText = true;
}
mpEscherEx->OpenContainer( ESCHER_SpContainer );
ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt
@@ -533,7 +533,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if ( rObj.ImplHasText() )
{
nGrpShapeID = ImplEnterAdditionalTextGroup( rObj.GetShapeRef(), &rObj.GetRect() );
bAdditionalText = sal_True;
bAdditionalText = true;
}
mpEscherEx->OpenContainer( ESCHER_SpContainer );
ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt
@@ -621,7 +621,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
else
{
//2do: could be made an option in HostAppData whether OLE object should be written or not
sal_Bool bAppOLE = sal_True;
bool bAppOLE = true;
ADD_SHAPE( ESCHER_ShpInst_PictureFrame,
0xa00 | (bAppOLE ? SHAPEFLAG_OLESHAPE : 0) );
if ( aPropOpt.CreateOLEGraphicProperties( rObj.GetShapeRef() ) )
@@ -834,19 +834,19 @@ sal_uInt32 ImplEESdrWriter::ImplEnterAdditionalTextGroup( const Reference< XShap
}
sal_Bool ImplEESdrWriter::ImplInitPageValues()
bool ImplEESdrWriter::ImplInitPageValues()
{
mnIndices = 0;
mnOutlinerCount = 0; // die outline objects must be in accordance with the layout.
mnEffectCount = 0;
mbIsTitlePossible = sal_True; // With more than one title PowerPoint will fail.
mbIsTitlePossible = true; // With more than one title PowerPoint will fail.
return sal_True;
return true;
}
void ImplEESdrWriter::ImplWritePage(
EscherSolverContainer& rSolverContainer,
ImplEESdrPageType ePageType, sal_Bool /* bBackGround */ )
ImplEESdrPageType ePageType, bool /* bBackGround */ )
{
ImplInitPageValues();
@@ -1047,9 +1047,9 @@ ImplEESdrObject::ImplEESdrObject( ImplEscherExSdr& rEx,
mnShapeId( 0 ),
mnTextSize( 0 ),
mnAngle( 0 ),
mbValid( sal_False ),
mbPresObj( sal_False ),
mbEmptyPresObj( sal_False ),
mbValid( false ),
mbPresObj( false ),
mbEmptyPresObj( false ),
mbOOXML(bOOXML)
{
SdrPage* pPage = rObj.GetPage();
@@ -1069,9 +1069,9 @@ ImplEESdrObject::ImplEESdrObject( ImplEESdrWriter& rEx,
mnShapeId( 0 ),
mnTextSize( 0 ),
mnAngle( 0 ),
mbValid( sal_False ),
mbPresObj( sal_False ),
mbEmptyPresObj( sal_False ),
mbValid( false ),
mbPresObj( false ),
mbEmptyPresObj( false ),
mbOOXML(false)
{
Init( rEx );
@@ -1219,24 +1219,24 @@ void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
if( mbPresObj && ImplGetPropertyValue( OUString("IsEmptyPresentationObject") ) )
mbEmptyPresObj = ::cppu::any2bool( mAny );
mbValid = sal_True;
mbValid = true;
}
}
sal_Bool ImplEESdrObject::ImplGetPropertyValue( const sal_Unicode* rString )
bool ImplEESdrObject::ImplGetPropertyValue( const sal_Unicode* rString )
{
sal_Bool bRetValue = sal_False;
bool bRetValue = false;
if( mbValid )
{
try
{
mAny = mXPropSet->getPropertyValue( rString );
if( mAny.hasValue() )
bRetValue = sal_True;
bRetValue = true;
}
catch( const ::com::sun::star::uno::Exception& )
{
bRetValue = sal_False;
bRetValue = false;
}
}
return bRetValue;
@@ -1262,7 +1262,7 @@ sal_uInt32 ImplEESdrObject::ImplGetText()
return mnTextSize;
}
sal_Bool ImplEESdrObject::ImplHasText() const
bool ImplEESdrObject::ImplHasText() const
{
Reference< XText > xXText( mXShape, UNO_QUERY );
return xXText.is() && !xXText->getString().isEmpty();
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index ff3eff0..11a9c61 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -40,9 +40,9 @@ class ImplEESdrObject
sal_uInt32 mnShapeId;
sal_uInt32 mnTextSize;
sal_Int32 mnAngle;
sal_Bool mbValid : 1;
sal_Bool mbPresObj : 1;
sal_Bool mbEmptyPresObj : 1;
bool mbValid : 1;
bool mbPresObj : 1;
bool mbEmptyPresObj : 1;
bool mbOOXML;
void Init( ImplEESdrWriter& rEx );
@@ -53,8 +53,8 @@ public:
ImplEESdrObject( ImplEESdrWriter& rEx, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape );
~ImplEESdrObject();
sal_Bool ImplGetPropertyValue( const sal_Unicode* pString );
sal_Bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); }
bool ImplGetPropertyValue( const sal_Unicode* pString );
bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); }
sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 )
{ return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; }
@@ -76,16 +76,16 @@ public:
sal_uInt32 GetTextSize() const { return mnTextSize; }
sal_Bool IsValid() const { return mbValid; }
sal_Bool IsPresObj() const { return mbPresObj; }
sal_Bool IsEmptyPresObj() const { return mbEmptyPresObj; }
bool IsValid() const { return mbValid; }
bool IsPresObj() const { return mbPresObj; }
bool IsEmptyPresObj() const { return mbEmptyPresObj; }
sal_uInt32 GetShapeId() const { return mnShapeId; }
void SetShapeId( sal_uInt32 nVal ) { mnShapeId = nVal; }
const SdrObject* GetSdrObject() const;
sal_uInt32 ImplGetText();
sal_Bool ImplHasText() const;
bool ImplHasText() const;
bool GetOOXML() const;
void SetOOXML(bool bOOXML);
};
@@ -137,30 +137,30 @@ protected:
sal_uInt16 mnEffectCount;
sal_Bool mbIsTitlePossible;
sal_Bool mbStatusIndicator;
sal_Bool mbStatus;
bool mbIsTitlePossible;
bool mbStatusIndicator;
bool mbStatus;
ImplEESdrWriter( EscherEx& rEx );
sal_Bool ImplInitPageValues();
bool ImplInitPageValues();
void ImplWritePage(
EscherSolverContainer& rSolver,
ImplEESdrPageType ePageType,
sal_Bool bBackGround = sal_False );
bool bBackGround = false );
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolver,
ImplEESdrPageType ePageType, const sal_Bool bOOxmlExport = false ); // returns ShapeID
ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID
void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
sal_Bool ImplGetText( ImplEESdrObject& rObj );
bool ImplGetText( ImplEESdrObject& rObj );
void ImplWriteAdditionalText(
ImplEESdrObject& rObj,
const Point& rTextRefPoint );
sal_uInt32 ImplEnterAdditionalTextGroup(
sal_uInt32 ImplEnterAdditionalTextGroup(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape,
const Rectangle* pBoundRect = NULL );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 30d0ec6..337a3c9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -445,7 +445,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
Reference< XShape > aXConnector( pPtr->pCObj->getUnoShape(), UNO_QUERY );
SdrGluePointList* pList = pO->ForceGluePointList();
sal_Bool bValidGluePoint = sal_False;
bool bValidGluePoint = false;
sal_Int32 nId = nC;
sal_uInt32 nInventor = pO->GetObjInventor();
@@ -491,7 +491,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
break;
}
if ( nId <= 3 )
bValidGluePoint = sal_True;
bValidGluePoint = true;
}
break;
case OBJ_POLY :
@@ -510,12 +510,12 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
{
if (pList->GetCount() > nC )
{
bValidGluePoint = sal_True;
bValidGluePoint = true;
nId = (sal_Int32)((*pList)[ (sal_uInt16)nC].GetId() + 3 );
}
else
{
sal_Bool bNotFound = sal_True;
bool bNotFound = true;
PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aXShape ) );
sal_uInt16 k, j, nPolySize = aPolyPoly.Count();
@@ -553,7 +553,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
aGluePoint.SetAlign( SDRVERTALIGN_TOP | SDRHORZALIGN_LEFT );
aGluePoint.SetEscDir( SDRESC_SMART );
nId = (sal_Int32)((*pList)[ pList->Insert( aGluePoint ) ].GetId() + 3 );
bNotFound = sal_False;
bNotFound = false;
}
nPointCount++;
}
@@ -563,7 +563,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
}
if ( !bNotFound )
{
bValidGluePoint = sal_True;
bValidGluePoint = true;
}
}
}
@@ -593,7 +593,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
{
if ( pList && ( pList->GetCount() > nC ) )
{
bValidGluePoint = sal_True;
bValidGluePoint = true;
nId = (sal_Int32)((*pList)[ (sal_uInt16)nC].GetId() + 3 );
}
}
@@ -625,7 +625,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
break;
}
if ( nId <= 3 )
bValidGluePoint = sal_True;
bValidGluePoint = true;
}
else if ( nGluePointType == EnhancedCustomShapeGluePointType::SEGMENTS )
{
@@ -715,7 +715,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
aProp.Name = sGluePoints;
aProp.Value <<= aGluePoints;
aGeometryItem.SetPropertyValue( sPath, aProp );
bValidGluePoint = sal_True;
bValidGluePoint = true;
((SdrObjCustomShape*)pO)->SetMergedItem( aGeometryItem );
SdrGluePointList* pLst = pO->ForceGluePointList();
if ( pLst->GetCount() > nGluePoints )
@@ -1008,7 +1008,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
if ( nLineFlags & 0x10 )
{
sal_Bool bScaleArrows = rManager.pSdrModel->GetScaleUnit() == MAP_TWIP;
bool bScaleArrows = rManager.pSdrModel->GetScaleUnit() == MAP_TWIP;
// LineStart
@@ -1201,7 +1201,7 @@ void ApplyRectangularGradientAsBitmap( const SvxMSDffManager& rManager, SvStream
if ( nFix16Angle )
{
sal_Bool bRotateWithShape = sal_True; // sal_True seems to be default
bool bRotateWithShape = true; // sal_True seems to be default
sal_uInt32 nPos = rIn.Tell();
if ( const_cast< SvxMSDffManager& >( rManager ).maShapeRecords.SeekToContent( rIn, DFF_msofbtUDefProp, SEEK_FROM_CURRENT_AND_RESTART ) )
{
@@ -1310,7 +1310,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
{
Graphic aGraf;
// first try to get BLIP from cache
sal_Bool bOK = const_cast<SvxMSDffManager&>(rManager).GetBLIP( GetPropertyValue( DFF_Prop_fillBlip ), aGraf, NULL );
bool bOK = const_cast<SvxMSDffManager&>(rManager).GetBLIP( GetPropertyValue( DFF_Prop_fillBlip ), aGraf, NULL );
// then try directly from stream (i.e. Excel chart hatches/bitmaps)
if ( !bOK )
bOK = SeekToContent( DFF_Prop_fillBlip, rIn ) && rManager.GetBLIPDirect( rIn, aGraf, NULL );
@@ -1374,7 +1374,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const
{
sal_Bool bVerticalText = sal_False;
bool bVerticalText = false;
sal_Int32 nTextLeft = GetPropertyValue( DFF_Prop_dxTextLeft, 25 * 3600 ) / 360; // 0.25 cm (emu)
sal_Int32 nTextRight = GetPropertyValue( DFF_Prop_dxTextRight, 25 * 3600 ) / 360; // 0.25 cm (emu)
sal_Int32 nTextTop = GetPropertyValue( DFF_Prop_dyTextTop, 13 * 3600 ) / 360; // 0.13 cm (emu)
@@ -1391,7 +1391,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const
case mso_txflTtoBA : /* #68110# */ // Top to Bottom @-font, oben -> unten
case mso_txflTtoBN : // Top to Bottom non-@, oben -> unten
case mso_txflVertN : // Vertical, non-@, oben -> unten
bVerticalText = sal_True; // nTextRotationAngle += 27000;
bVerticalText = true; // nTextRotationAngle += 27000;
break;
default: break;
}
@@ -1588,7 +1588,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
// "Extrusion" PropertySequence element
sal_Bool bExtrusionOn = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 8 ) != 0;
bool bExtrusionOn = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 8 ) != 0;
if ( bExtrusionOn )
{
PropVec aExtrusionPropVec;
@@ -1646,19 +1646,19 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
}
// "LightFace"
const OUString sExtrusionLightFace( "LightFace" );
sal_Bool bExtrusionLightFace = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 1 ) != 0;
bool bExtrusionLightFace = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 1 ) != 0;
aProp.Name = sExtrusionLightFace;
aProp.Value <<= bExtrusionLightFace;
aExtrusionPropVec.push_back( aProp );
// "FirstLightHarsh"
const OUString sExtrusionFirstLightHarsh( "FirstLightHarsh" );
sal_Bool bExtrusionFirstLightHarsh = ( GetPropertyValue( DFF_Prop_fc3DFillHarsh ) & 2 ) != 0;
bool bExtrusionFirstLightHarsh = ( GetPropertyValue( DFF_Prop_fc3DFillHarsh ) & 2 ) != 0;
aProp.Name = sExtrusionFirstLightHarsh;
aProp.Value <<= bExtrusionFirstLightHarsh;
aExtrusionPropVec.push_back( aProp );
// "SecondLightHarsh"
const OUString sExtrusionSecondLightHarsh( "SecondLightHarsh" );
sal_Bool bExtrusionSecondLightHarsh = ( GetPropertyValue( DFF_Prop_fc3DFillHarsh ) & 1 ) != 0;
bool bExtrusionSecondLightHarsh = ( GetPropertyValue( DFF_Prop_fc3DFillHarsh ) & 1 ) != 0;
aProp.Name = sExtrusionSecondLightHarsh;
aProp.Value <<= bExtrusionSecondLightHarsh;
aExtrusionPropVec.push_back( aProp );
@@ -1709,7 +1709,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
// "Metal"
const OUString sExtrusionMetal( "Metal" );
sal_Bool bExtrusionMetal = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 4 ) != 0;
bool bExtrusionMetal = ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 4 ) != 0;
aProp.Name = sExtrusionMetal;
aProp.Value <<= bExtrusionMetal;
aExtrusionPropVec.push_back( aProp );
@@ -1833,7 +1833,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
}
// "ExtrusionColor"
const OUString sExtrusionColor( "Color" );
sal_Bool bExtrusionColor = IsProperty( DFF_Prop_c3DExtrusionColor ); // ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 2 ) != 0;
bool bExtrusionColor = IsProperty( DFF_Prop_c3DExtrusionColor ); // ( GetPropertyValue( DFF_Prop_fc3DLightFace ) & 2 ) != 0;
aProp.Name = sExtrusionColor;
aProp.Value <<= bExtrusionColor;
aExtrusionPropVec.push_back( aProp );
@@ -1929,7 +1929,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X )
{
sal_Bool bMirroredX = sal_True;
bool bMirroredX = true;
const OUString sHandleMirroredX( "MirroredX" );
aProp.Name = sHandleMirroredX;
aProp.Value <<= bMirroredX;
@@ -1937,7 +1937,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
}
if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y )
{
sal_Bool bMirroredY = sal_True;
bool bMirroredY = true;
const OUString sHandleMirroredY( "MirroredY" );
aProp.Name = sHandleMirroredY;
aProp.Value <<= bMirroredY;
@@ -1945,7 +1945,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
}
if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED )
{
sal_Bool bSwitched = sal_True;
bool bSwitched = true;
const OUString sHandleSwitched( "Switched" );
aProp.Name = sHandleSwitched;
aProp.Value <<= bSwitched;
@@ -2104,7 +2104,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( IsHardAttribute( DFF_Prop_f3DOK ) )
{
const OUString sExtrusionAllowed( "ExtrusionAllowed" );
sal_Bool bExtrusionAllowed = ( GetPropertyValue( DFF_Prop_fFillOK ) & 16 ) != 0;
bool bExtrusionAllowed = ( GetPropertyValue( DFF_Prop_fFillOK ) & 16 ) != 0;
aProp.Name = sExtrusionAllowed;
aProp.Value <<= bExtrusionAllowed;
aPathPropVec.push_back( aProp );
@@ -2113,7 +2113,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( IsHardAttribute( DFF_Prop_fFillShadeShapeOK ) )
{
const OUString sConcentricGradientFillAllowed( "ConcentricGradientFillAllowed" );
sal_Bool bConcentricGradientFillAllowed = ( GetPropertyValue( DFF_Prop_fFillOK ) & 2 ) != 0;
bool bConcentricGradientFillAllowed = ( GetPropertyValue( DFF_Prop_fFillOK ) & 2 ) != 0;
aProp.Name = sConcentricGradientFillAllowed;
aProp.Value <<= bConcentricGradientFillAllowed;
aPathPropVec.push_back( aProp );
@@ -2122,7 +2122,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
if ( IsHardAttribute( DFF_Prop_fGtextOK ) || ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 ) & 0x4000 ) )
{
const OUString sTextPathAllowed( "TextPathAllowed" );
sal_Bool bTextPathAllowed = ( GetPropertyValue( DFF_Prop_fFillOK ) & 4 ) != 0;
bool bTextPathAllowed = ( GetPropertyValue( DFF_Prop_fFillOK ) & 4 ) != 0;
aProp.Name = sTextPathAllowed;
aProp.Value <<= bTextPathAllowed;
aPathPropVec.push_back( aProp );
@@ -2394,7 +2394,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
// "TextPath" PropertySequence element
sal_Bool bTextPathOn = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x4000 ) != 0;
bool bTextPathOn = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x4000 ) != 0;
if ( bTextPathOn )
{
PropVec aTextPathPropVec;
@@ -2407,9 +2407,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
// TextPathMode
const OUString sTextPathMode( "TextPathMode" );
sal_Bool bTextPathFitPath = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x100 ) != 0;
bool bTextPathFitPath = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x100 ) != 0;
sal_Bool bTextPathFitShape;
bool bTextPathFitShape;
if ( IsHardAttribute( DFF_Prop_gtextFStretch ) )
bTextPathFitShape = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x400 ) != 0;
else
@@ -2436,13 +2436,13 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
// ScaleX
const OUString sTextPathScaleX( "ScaleX" );
sal_Bool bTextPathScaleX = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x40 ) != 0;
bool bTextPathScaleX = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x40 ) != 0;
aProp.Name = sTextPathScaleX;
aProp.Value <<= bTextPathScaleX;
aTextPathPropVec.push_back( aProp );
// SameLetterHeights
const OUString sSameLetterHeight( "SameLetterHeights" );
sal_Bool bSameLetterHeight = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x80 ) != 0;
bool bSameLetterHeight = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough ) & 0x80 ) != 0;
aProp.Name = sSameLetterHeight;
aProp.Value <<= bSameLetterHeight;
aTextPathPropVec.push_back( aProp );
@@ -2517,7 +2517,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const
void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObjData& rObjData ) const
{
sal_Bool bHasShadow = sal_False;
bool bHasShadow = false;
bool bNonZeroShadowOffset = false;
if ( IsProperty( DFF_Prop_gtextSize ) )
@@ -2623,7 +2623,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
}
}
if ( ( ( nLineFlags & 0x08 ) == 0 ) && ( ( nFillFlags & 0x10 ) == 0 ) && ( rObjData.eShapeType != mso_sptPictureFrame )) // if there is no fillstyle and linestyle
bHasShadow = sal_False; // we are turning shadow off.
bHasShadow = false; // we are turning shadow off.
}
if ( bHasShadow )
@@ -2645,7 +2645,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItemSet& rSet, DffObjData& rObjData ) const
{
sal_Bool bRotateTextWithShape = rObjData.bRotateTextWithShape;
bool bRotateTextWithShape = rObjData.bRotateTextWithShape;
if ( rObjData.bOpt2 ) // sj: #158494# is the second property set available ? if then we have to check the xml data of
{ // the shape, because the textrotation of Excel 2003 and greater versions is stored there
// (upright property of the textbox)
@@ -2684,7 +2684,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem
{ // for only one property I spare to use a XML parser at this point, this
// should be enhanced if needed
bRotateTextWithShape = sal_True; // using the correct xml default
bRotateTextWithShape = true; // using the correct xml default
const char* pArry = reinterpret_cast< char* >( aSeq.getArray() );
const char* pUpright = "upright=";
const char* pEnd = pArry + nBytesRead;
@@ -3553,7 +3553,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj )
SdrOutliner& rOutliner = pText->ImpGetDrawOutliner();
rOutliner.Init( OUTLINERMODE_TEXTOBJECT );
sal_Bool bOldUpdateMode = rOutliner.GetUpdateMode();
bool bOldUpdateMode = rOutliner.GetUpdateMode();
rOutliner.SetUpdateMode( false );
rOutliner.SetVertical( pText->IsVerticalWriting() );
@@ -3704,7 +3704,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
MSO_BlipFlags eFlags = (MSO_BlipFlags)GetPropertyValue( DFF_Prop_pibFlags, mso_blipflagDefault );
sal_uInt32 nBlipId = GetPropertyValue( DFF_Prop_pib, 0 );
sal_Bool bGrfRead = sal_False,
bool bGrfRead = false,
// Graphic linked
bLinkGrf = 0 != ( eFlags & mso_blipflagLinkToFile );
@@ -4229,7 +4229,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
{
SfxItemSet aSet( pSdrModel->GetItemPool() );
sal_Bool bIsConnector = ( ( aObjData.eShapeType >= mso_sptStraightConnector1 ) && ( aObjData.eShapeType <= mso_sptCurvedConnector5 ) );
bool bIsConnector = ( ( aObjData.eShapeType >= mso_sptStraightConnector1 ) && ( aObjData.eShapeType <= mso_sptCurvedConnector5 ) );
sal_Int32 nObjectRotation = mnFix16Angle;
sal_uInt32 nSpFlags = aObjData.nSpFlags;
@@ -4259,7 +4259,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
pRet = new SdrObjCustomShape();
pRet->SetModel( pSdrModel );
sal_Bool bIsFontwork = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 ) & 0x4000 ) != 0;
bool bIsFontwork = ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 ) & 0x4000 ) != 0;
// in case of a FontWork, the text is set by the escher import
if ( bIsFontwork )
@@ -4345,7 +4345,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
if ( pParaObj )
{
SdrOutliner& rOutliner = ((SdrObjCustomShape*)pRet)->ImpGetDrawOutliner();
sal_Bool bOldUpdateMode = rOutliner.GetUpdateMode();
bool bOldUpdateMode = rOutliner.GetUpdateMode();
SdrModel* pModel = pRet->GetModel();
if ( pModel )
rOutliner.SetStyleSheetPool( (SfxStyleSheetPool*)pModel->GetStyleSheetPool() );
@@ -4356,7 +4356,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
sal_Int32 i, nParagraphs = rOutliner.GetParagraphCount();
if ( nParagraphs )
{
sal_Bool bCreateNewParaObject = sal_False;
bool bCreateNewParaObject = false;
for ( i = 0; i < nParagraphs; i++ )
{
OUString aString(rOutliner.GetText(rOutliner.GetParagraph(i)));
@@ -4366,7 +4366,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
SfxItemSet aSet2( rOutliner.GetParaAttribs( i ) );
aSet2.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) );
rOutliner.SetParaAttribs( i, aSet2 );
bCreateNewParaObject = sal_True;
bCreateNewParaObject = true;
}
}
if ( bCreateNewParaObject )
@@ -4828,7 +4828,7 @@ void SvxMSDffManager::GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt
if (!rHd.SeekToContent(rSt))
return;
sal_Bool bFirst = sal_True;
bool bFirst = true;
DffRecordHeader aShapeHd;
while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) )
{
@@ -4869,7 +4869,7 @@ void SvxMSDffManager::GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt
fHeight *= fYScale;
rGroupClientAnchor = Rectangle( Point( (sal_Int32)fl, (sal_Int32)fo ), Size( (sal_Int32)( fWidth + 1 ), (sal_Int32)( fHeight + 1 ) ) );
}
bFirst = sal_False;
bFirst = false;
}
else
rGroupChildAnchor.Union( aChild );
@@ -5171,46 +5171,46 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
(MSO_Anchor)GetPropertyValue( DFF_Prop_anchorText );
SdrTextVertAdjust eTVA = SDRTEXTVERTADJUST_CENTER;
sal_Bool bTVASet(sal_False);
bool bTVASet(false);
SdrTextHorzAdjust eTHA = SDRTEXTHORZADJUST_CENTER;
sal_Bool bTHASet(sal_False);
bool bTHASet(false);
switch( eTextAnchor )
{
case mso_anchorTop:
{
eTVA = SDRTEXTVERTADJUST_TOP;
bTVASet = sal_True;
bTVASet = true;
}
break;
case mso_anchorTopCentered:
{
eTVA = SDRTEXTVERTADJUST_TOP;
bTVASet = sal_True;
bTHASet = sal_True;
bTVASet = true;
bTHASet = true;
}
break;
case mso_anchorMiddle:
bTVASet = sal_True;
bTVASet = true;
break;
case mso_anchorMiddleCentered:
{
bTVASet = sal_True;
bTHASet = sal_True;
bTVASet = true;
bTHASet = true;
}
break;
case mso_anchorBottom:
{
eTVA = SDRTEXTVERTADJUST_BOTTOM;
bTVASet = sal_True;
bTVASet = true;
}
break;
case mso_anchorBottomCentered:
{
eTVA = SDRTEXTVERTADJUST_BOTTOM;
bTVASet = sal_True;
bTHASet = sal_True;
bTVASet = true;
bTHASet = true;
}
break;
default : break;
@@ -5655,7 +5655,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
m_pShapeInfosById.reset(new SvxMSDffShapeInfos_ById);
// mangle old Info array, sorted by nTxBxComp
sal_uLong nChain = ULONG_MAX;
sal_Bool bSetReplaceFALSE = sal_False;
bool bSetReplaceFALSE = false;
for (SvxMSDffShapeInfos_ByTxBxComp::iterator iter =
m_pShapeInfosByTxBxComp->begin(),
mark = m_pShapeInfosByTxBxComp->begin();
@@ -5687,7 +5687,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
else if( !pObj->bReplaceByFly )
{
// object that must NOT be replaced by frame?
bSetReplaceFALSE = sal_True;
bSetReplaceFALSE = true;
// maybe reset flags in start of group
for (SvxMSDffShapeInfos_ByTxBxComp::iterator itemp = mark;
itemp != iter; ++itemp)
@@ -5739,7 +5739,7 @@ void SvxMSDffManager::GetCtrlData( sal_uInt32 nOffsDgg_ )
sal_uInt32 nLength;
if( !this->ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return;
sal_Bool bOk;
bool bOk;
sal_uLong nPos = nOffsDggL + DFF_COMMON_RECORD_HEADER_SIZE;
// case A: first Drawing Group Container, then n times Drawing Container
@@ -5824,7 +5824,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe
{
nLenFBSE = nLength;
// is FBSE big enough for our data
sal_Bool bOk = ( nSkipBLIPLen + 4 + nSkipBLIPPos + 4 <= nLenFBSE );
bool bOk = ( nSkipBLIPLen + 4 + nSkipBLIPPos + 4 <= nLenFBSE );
if( bOk )
{
@@ -5906,7 +5906,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
long nStartShapeGroupCont = rSt.Tell();
// We are now in a shape group container (conditionally mulitple per page)
// an we now have to iterate through all contained shape containers
sal_Bool bFirst = !bPatriarch;
bool bFirst = !bPatriarch;
sal_uLong nReadSpGrCont = 0;
do
{
@@ -5958,7 +5958,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
// Can the shape be replaced with a frame?
// (provided that it is a TextBox and the text is not rotated)
sal_Bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? sal_False : sal_True;
bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? sal_False : sal_True;
// we don't know yet whether it's a TextBox
MSO_SPT eShapeType = mso_sptNil;
@@ -6025,22 +6025,22 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
SVXMSDFF_SETTINGS_IMPORT_EXCEL))
{
if( 0 != nPropVal )
bCanBeReplaced = sal_False;
bCanBeReplaced = false;
}
break;
case DFF_Prop_Rotation :
if( 0 != nPropVal )
bCanBeReplaced = sal_False;
bCanBeReplaced = false;
break;
case DFF_Prop_gtextFStrikethrough :
if( ( 0x20002000 & nPropVal ) == 0x20002000 )
bCanBeReplaced = sal_False;
bCanBeReplaced = false;
break;
case DFF_Prop_fc3DLightFace :
if( ( 0x00080008 & nPropVal ) == 0x00080008 )
bCanBeReplaced = sal_False;
bCanBeReplaced = false;
break;
case DFF_Prop_WrapText :
@@ -6166,7 +6166,7 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape,
******************************************************************************/
bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* pVisArea )
{
sal_Bool bOk = sal_False; // initialize result variable
bool bOk = false; // initialize result variable
if ( pStData )
{
// check if a graphic for this blipId is already imported
@@ -6181,7 +6181,7 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* pVisA
GraphicObject aGraphicObject( iter->second );
rData = aGraphicObject.GetGraphic();
if ( rData.GetType() != GRAPHIC_NONE )
bOk = sal_True;
bOk = true;
else
aEscherBlipCache.erase(iter);
}
@@ -6260,8 +6260,8 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
{
Size aMtfSize100;
sal_Bool bMtfBLIP = sal_False;
sal_Bool bZCodecCompression = sal_False;
bool bMtfBLIP = false;
bool bZCodecCompression = false;
// now position it exactly at the beinning of the embedded graphic
sal_uLong nSkip = ( nInst & 0x0001 ) ? 32 : 16;
@@ -6287,7 +6287,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
// skip rest of header
nSkip = 6;
bMtfBLIP = bZCodecCompression = sal_True;
bMtfBLIP = bZCodecCompression = true;
}
break;
case 0x46A : // One byte tag then JPEG (= JFIF) data
@@ -6639,7 +6639,7 @@ static const ClsIDs aClsIDs[] = {
bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
const GDIMetaFile * pMtf, const SotStorageRef& rDest )
{
sal_Bool bMtfRead = sal_False;
bool bMtfRead = false;
SotStorageStreamRef xOle10Stm = rDest->OpenSotStream( OUString("\1Ole10Native"),
STREAM_WRITE| STREAM_SHARE_DENYALL );
if( xOle10Stm->GetError() )
@@ -6721,7 +6721,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
{
const GDIMetaFile& rMtf = aGraphic.GetGDIMetaFile();
MakeContentStream( rDest, rMtf );
bMtfRead = sal_True;
bMtfRead = true;
}
// set behind the data
rStm.Seek( nPos + nDataLen );
@@ -7014,7 +7014,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
// does the 01Ole-Stream exist at all?
// (that's not the case for e.g. Fontwork )
// If that's not the case -> include it as graphic
sal_Bool bValidStorage = sal_False;
bool bValidStorage = false;
OUString aDstStgName(MSO_OLE_Obj);
aDstStgName += OUString::number( ++nMSOleObjCntr );
@@ -7092,10 +7092,10 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
if( xObjStor->GetError() )
{
rError = xObjStor->GetError();
bValidStorage = sal_False;
bValidStorage = false;
}
else if( !xObjStor.Is() )
bValidStorage = sal_False;
bValidStorage = false;
}
}
else if( pDataStrm )
@@ -7106,7 +7106,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
// Id in BugDoc - exist there other Ids?
// The ConvertToOle2 - does not check for consistent
0x30008 != nDummy )
bValidStorage = sal_False;
bValidStorage = false;
else
{
// or is it an OLE-1 Stream in the DataStream?
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 46c096a..374707c 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -81,7 +81,7 @@ OUString GetStorageType( const SvGlobalName& aEmbName )
return OUString();
}
sal_Bool UseOldMSExport()
bool UseOldMSExport()
{
uno::Reference< lang::XMultiServiceFactory > xProvider(
configuration::theDefaultProvider::get(
@@ -98,7 +98,7 @@ sal_Bool UseOldMSExport()
{
uno::Any aResult = xNameAccess->getByName( "UseOldExport" );
sal_Bool bResult = sal_Bool();
bool bResult;
if ( aResult >>= bResult )
return bResult;
}
@@ -108,7 +108,7 @@ sal_Bool UseOldMSExport()
}
OSL_FAIL( "Could not get access to configuration entry!\n" );
return sal_False;
return false;
}
void SvxMSExportOLEObjects::ExportOLEObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg )
@@ -228,7 +228,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
OUString( "properties_stream" ),
STREAM_STD_READWRITE);
sal_Bool bExtentSuccess = sal_False;
bool bExtentSuccess = false;
if( !xExtStm->GetError() )
{
// write extent
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index aa9ad1e..8157cbf 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -538,7 +538,7 @@ bool SdrEscherImport::ReadString( OUString& rStr ) const
|| aStrHd.nRecType == PPT_PST_TextCharsAtom
|| aStrHd.nRecType == PPT_PST_CString)
{
sal_Bool bUniCode =
bool bUniCode =
(aStrHd.nRecType == PPT_PST_TextCharsAtom
|| aStrHd.nRecType == PPT_PST_CString);
bRet = true;
@@ -778,7 +778,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
PPTTextObj aTextObj( rSt, (SdrPowerPointImport&)*this, rPersistEntry, &rObjData );
if ( ( aTextObj.Count() || aTextObj.GetOEPlaceHolderAtom() ) )
{
sal_Bool bVerticalText = sal_False;
bool bVerticalText = false;
// and if the text object is not empty, it must be applied to pRet, the object we
// initially got from our escher import
sal_Int32 nTextRotationAngle = 0;
@@ -809,7 +809,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
aTextObj.SetVertical( bVerticalText );
if ( pRet )
{
sal_Bool bDeleteSource = aTextObj.GetOEPlaceHolderAtom() != 0;
bool bDeleteSource = aTextObj.GetOEPlaceHolderAtom() != 0;
if ( bDeleteSource && !pRet->ISA( SdrGrafObj ) // we are not allowed to get
&& !pRet->ISA( SdrObjGroup ) // grouped placeholder objects
&& !pRet->ISA( SdrOle2Obj ) )
@@ -827,7 +827,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
sal_Int32 nMinFrameWidth = 0;
sal_Int32 nMinFrameHeight = 0;
sal_Bool bAutoGrowWidth, bAutoGrowHeight;
bool bAutoGrowWidth, bAutoGrowHeight;
SdrTextVertAdjust eTVA;
SdrTextHorzAdjust eTHA;
@@ -1011,16 +1011,16 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
}
}
SdrObject* pTObj = NULL;
sal_Bool bWordWrap = (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone;
sal_Bool bFitShapeToText = ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0;
bool bWordWrap = (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone;
bool bFitShapeToText = ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0;
if ( pRet && pRet->ISA( SdrObjCustomShape ) && ( eTextKind == OBJ_RECT ) )
{
bAutoGrowHeight = bFitShapeToText;
if ( bWordWrap )
bAutoGrowWidth = sal_False;
bAutoGrowWidth = false;
else
bAutoGrowWidth = sal_True;
bAutoGrowWidth = true;
pTObj = pRet;
pRet = NULL;
}
@@ -1045,11 +1045,11 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( bVerticalText )
{
bAutoGrowWidth = bFitShapeToText;
bAutoGrowHeight = sal_False;
bAutoGrowHeight = false;
}
else
{
bAutoGrowWidth = sal_False;
bAutoGrowWidth = false;
// #119885# re-activationg bFitShapeToText here, could not find deeper explanations
// for it (it was from 2005). Keeping the old comment here for reference
@@ -1794,7 +1794,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
sal_uInt32 nLen = aHd.nRecLen - 4;
if ( (sal_Int32)nLen > 0 )
{
sal_Bool bSuccess = sal_False;
bool bSuccess = false;
rStCtrl.SeekRel( 4 );
@@ -1826,7 +1826,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
if ( xSrcTst.Is() )
{
sal_uInt8 aTestA[ 10 ];
sal_Bool bGetItAsOle = ( sizeof( aTestA ) == xSrcTst->Read( aTestA, sizeof( aTestA ) ) );
bool bGetItAsOle = ( sizeof( aTestA ) == xSrcTst->Read( aTestA, sizeof( aTestA ) ) );
if ( !bGetItAsOle )
{ // maybe there is a contentsstream in here
xSrcTst = xObjStor->OpenSotStream( "Contents", STREAM_READWRITE | STREAM_NOCREATE );
@@ -1995,12 +1995,12 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
xSource->FillInfoList( &aList );
sal_uInt32 i;
sal_Bool bCopied = sal_True;
bool bCopied = true;
for ( i = 0; i < aList.size(); i++ ) // copy all entries
{
const SvStorageInfo& rInfo = aList[ i ];
if ( !xSource->CopyTo( rInfo.GetName(), xMacros, rInfo.GetName() ) )
bCopied = sal_False;
bCopied = false;
}
if ( i && bCopied )
{
@@ -2192,7 +2192,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
if ( ( pText->GetObjInventor() == SdrInventor ) && ( pText->GetObjIdentifier() == OBJ_TITLETEXT ) ) // Outliner-Style for Title-Text object?!? (->of DL)
rOutliner.Init( OUTLINERMODE_TITLEOBJECT ); // Outliner reset
sal_Bool bOldUpdateMode = rOutliner.GetUpdateMode();
bool bOldUpdateMode = rOutliner.GetUpdateMode();
rOutliner.SetUpdateMode( false );
if ( pSheet )
{
@@ -2339,7 +2339,7 @@ bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream&
DffRecordHeader aProgTagsHd, aProgTagBinaryDataHd;
rSourceHd.SeekToContent( rSt );
sal_Bool bFound = rSourceHd.nRecType == PPT_PST_ProgTags;
bool bFound = rSourceHd.nRecType == PPT_PST_ProgTags;
if ( !bFound )
bFound = SeekToRec( rSt, PPT_PST_ProgTags, rSourceHd.GetRecEndFilePos(), &aProgTagsHd );
if ( bFound )
@@ -2423,7 +2423,7 @@ void SdrPowerPointImport::SetPageNum( sal_uInt16 nPageNum, PptPageKind eKind )
pPPTStyleSheet = NULL;
sal_Bool bHasMasterPage = sal_True;
bool bHasMasterPage = true;
sal_uInt16 nMasterIndex = 0;
if ( eKind == PPT_MASTERPAGE )
@@ -2433,7 +2433,7 @@ void SdrPowerPointImport::SetPageNum( sal_uInt16 nPageNum, PptPageKind eKind )
if ( HasMasterPage( nPageNum, eKind ) )
nMasterIndex = GetMasterPageIndex( nPageNum, eKind );
else
bHasMasterPage = sal_False;
bHasMasterPage = false;
}
if ( bHasMasterPage )
{
@@ -2763,7 +2763,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
if ( pE->nBackgroundOffset )
{
// do not follow master colorscheme?
sal_Bool bTemporary = ( rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
bool bTemporary = ( rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
sal_uInt32 nPos = rStCtrl.Tell();
rStCtrl.Seek( pE->nBackgroundOffset );
rSlidePersist.pBObj = ImportObj( rStCtrl, (void*)&aProcessData, aPageSize, aPageSize );
@@ -2926,7 +2926,7 @@ sal_uInt16 SdrPowerPointImport::GetMasterPageIndex( sal_uInt16 nPageNum, PptPage
SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, bool bForce )
{
SdrObject* pRet = NULL;
sal_Bool bCreateObj = bForce;
bool bCreateObj = bForce;
boost::scoped_ptr<SfxItemSet> pSet;
sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later
DffRecordHeader aPageHd;
@@ -3314,7 +3314,7 @@ bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rManag
SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel, sal_uInt32 nInstance, sal_uInt32 nDestinationInstance,
boost::optional< sal_Int16 >& rStartNumbering, sal_uInt32 nFontHeight, PPTParagraphObj* pPara )
{
sal_Bool bHardAttribute = ( nDestinationInstance == 0xffffffff );
bool bHardAttribute = ( nDestinationInstance == 0xffffffff );
sal_uInt32 nBuFlags = 0;
sal_uInt16 nHasAnm = 0;
@@ -3336,7 +3336,7 @@ bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rManag
nAnmScheme = pPara->pParaSet->mnAnmScheme;
if ( nBuFlags & 0x02000000 )
nHasAnm = pPara->pParaSet->mnHasAnm;
bHardAttribute = sal_True;
bHardAttribute = true;
}
}
@@ -3559,7 +3559,7 @@ void PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx
nIsBullet = ( rParaLevel.mnBuFlags & ( 1 << PPT_ParaAttr_BulletOn ) ) != 0 ? 1 : 0;
nBulletChar = rParaLevel.mnBulletChar;
sal_Bool bBuHardFont;
bool bBuHardFont;
bBuHardFont = ( rParaLevel.mnBuFlags & ( 1 << PPT_ParaAttr_BuHardFont ) ) != 0;
if ( bBuHardFont )
nBulletFont = rParaLevel.mnBulletFont;
@@ -4004,7 +4004,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
it seems that the environment TextStyle is having a higher priority
than the TextStyle that can be found within the master page
*/
sal_Bool bFoundTxMasterStyleAtom04 = sal_False;
bool bFoundTxMasterStyleAtom04 = false;
DffRecordHeader* pEnvHeader = rManager.aDocRecManager.GetRecordHeader( PPT_PST_Environment );
if ( pEnvHeader )
{
@@ -4019,8 +4019,8 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
rIn.ReadUInt16( nLevelAnz );
sal_uInt16 nLev = 0;
sal_Bool bFirst = sal_True;
bFoundTxMasterStyleAtom04 = sal_True;
bool bFirst = true;
bFoundTxMasterStyleAtom04 = true;
while ( rIn.GetError() == 0 && rIn.Tell() < aTxMasterStyleHd.GetRecEndFilePos() && nLev < nLevelAnz )
{
if ( nLev )
@@ -4046,7 +4046,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
}
mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, true, nLev, bFirst );
mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize( nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
bFirst = sal_False;
bFirst = false;
nLev++;
}
break;
@@ -4070,7 +4070,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
{
sal_uInt32 nInstance = aTxMasterStyleHd.nRecInstance;
if ( ( nInstance < PPT_STYLESHEETENTRYS ) &&
( ( nInstance != TSS_TYPE_TEXT_IN_SHAPE ) || ( bFoundTxMasterStyleAtom04 == sal_False ) ) )
( ( nInstance != TSS_TYPE_TEXT_IN_SHAPE ) || ( bFoundTxMasterStyleAtom04 == false ) ) )
{
if ( nInstance > 4 )
{
@@ -4114,7 +4114,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
nLevelAnz = 5;
}
sal_uInt16 nLev = 0;
sal_Bool bFirst = sal_True;
bool bFirst = true;
while ( rIn.GetError() == 0 && rIn.Tell() < aTxMasterStyleHd.GetRecEndFilePos() && nLev < nLevelAnz )
{
@@ -4127,7 +4127,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
// Exception: Template 5, 6 (MasterTitle Title und SubTitle)
if ( nInstance >= TSS_TYPE_SUBTITLE )
{
bFirst = sal_False;
bFirst = false;
sal_uInt16 nDontKnow;
rIn.ReadUInt16( nDontKnow );
@@ -4135,7 +4135,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
mpParaSheet[ nInstance ]->Read( rManager, rIn, true, nLev, bFirst );
mpCharSheet[ nInstance ]->Read( rIn, true, nLev, bFirst );
mpParaSheet[ nInstance ]->UpdateBulletRelSize( nLev, mpCharSheet[ nInstance ]->maCharLevel[ nLev ].mnFontHeight );
bFirst = sal_False;
bFirst = false;
nLev++;
}
#ifdef DBG_UTIL
@@ -4204,7 +4204,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
rIn.ReadUInt16( nLevelAnz );
sal_uInt16 nLev = 0;
sal_Bool bFirst = sal_True;
bool bFirst = true;
while ( rIn.GetError() == 0 && rIn.Tell() < aTxMasterStyleHd2.GetRecEndFilePos() && nLev < nLevelAnz )
{
if ( nLev )
@@ -4230,7 +4230,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
}
mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->Read( rIn, true, nLev, bFirst );
mpParaSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->UpdateBulletRelSize( nLev, mpCharSheet[ TSS_TYPE_TEXT_IN_SHAPE ]->maCharLevel[ nLev ].mnFontHeight );
bFirst = sal_False;
bFirst = false;
nLev++;
}
break;
@@ -5151,7 +5151,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
ReadParaProps( rIn, rMan, rTextHeader, aString, rRuler, nCharCount, bTextPropAtom );
sal_Bool bEmptyParaPossible = sal_True;
bool bEmptyParaPossible = true;
sal_uInt32 nCharAnzRead = 0;
sal_uInt32 nCurrentPara = 0;
size_t i = 1; // points to the next element to process
@@ -5202,7 +5202,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
nLen++;
nCharAnzRead += nLen;
nCharCount -= nLen;
bEmptyParaPossible = sal_True;
bEmptyParaPossible = true;
}
else if ( nCurrentSpecMarker & PPT_SPEC_SYMBOL )
{
@@ -5221,7 +5221,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
aCharPropList.push_back( pCPropSet );
nCharCount--;
nCharAnzRead++;
bEmptyParaPossible = sal_False;
bEmptyParaPossible = false;
}
nCurrentSpecMarker = ( i < aSpecMarkerList.size() ) ? aSpecMarkerList[ i++ ] : 0;
}
@@ -5230,7 +5230,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
aCharPropSet.maString = aString.copy(nCharAnzRead, nCharCount);
aCharPropList.push_back( new PPTCharPropSet( aCharPropSet, nCurrentPara ) );
nCharAnzRead += nCharCount;
bEmptyParaPossible = sal_False;
bEmptyParaPossible = false;
break;
}
}
@@ -5737,7 +5737,7 @@ bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uI
{
if ( nAttr == PPT_ParaAttr_BulletColor )
{
sal_Bool bHardBulletColor;
bool bHardBulletColor;
if ( pParaSet->mnAttrSet & ( 1 << PPT_ParaAttr_BuHardColor ) )
bHardBulletColor = pParaSet->mpArry[ PPT_ParaAttr_BuHardColor ] != 0;
else
@@ -5764,7 +5764,7 @@ bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uI
}
else if ( nAttr == PPT_ParaAttr_BulletFont )
{
sal_Bool bHardBuFont;
bool bHardBuFont;
if ( pParaSet->mnAttrSet & ( 1 << PPT_ParaAttr_BuHardFont ) )
bHardBuFont = pParaSet->mpArry[ PPT_ParaAttr_BuHardFont ] != 0;
else
@@ -5829,7 +5829,7 @@ bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uI
break;
case PPT_ParaAttr_BulletFont :
{
sal_Bool bHardBuFont;
bool bHardBuFont;
if ( pParaSet->mnAttrSet & ( 1 << PPT_ParaAttr_BuHardFont ) )
bHardBuFont = pParaSet->mpArry[ PPT_ParaAttr_BuHardFont ] != 0;
else
@@ -5865,7 +5865,7 @@ bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr, sal_uInt32& rRetValue, sal_uI
break;
case PPT_ParaAttr_BulletColor :
{
sal_Bool bHardBulletColor;
bool bHardBulletColor;
if ( pParaSet->mnAttrSet & ( 1 << PPT_ParaAttr_BuHardColor ) )
bHardBulletColor = pParaSet->mpArry[ PPT_ParaAttr_BuHardColor ] != 0;
else
@@ -6076,11 +6076,11 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >&
// LineSpacing
PPTPortionObj* pPortion = First();
sal_Bool bIsHardAttribute = GetAttrib( PPT_ParaAttr_LineFeed, nVal, nDestinationInstance );
bool bIsHardAttribute = GetAttrib( PPT_ParaAttr_LineFeed, nVal, nDestinationInstance );
nVal2 = (sal_Int16)nVal;
sal_uInt32 nFont = sal_uInt32();
if ( pPortion && pPortion->GetAttrib( PPT_CharAttr_Font, nFont, nDestinationInstance ) )
bIsHardAttribute = sal_True;
bIsHardAttribute = true;
if ( bIsHardAttribute )
{
@@ -6120,7 +6120,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >&
if ( ((sal_Int16)nLowerDist) > 0 )
nLowerDist = - (sal_Int16)( ( nFontHeight * nLowerDist * 100 ) / 1000 );
}
bIsHardAttribute = sal_True;
bIsHardAttribute = true;
}
if ( bIsHardAttribute )
{
@@ -6995,13 +6995,13 @@ bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 >& rRows,
sal_Int32& nTableIndex, sal_Int32& nRow, sal_Int32& nRowCount, sal_Int32& nColumn, sal_Int32& nColumnCount )
{
Rectangle aSnapRect( pObj->GetSnapRect() );
sal_Bool bCellObject = ( aSnapRect.GetWidth() > 1 ) && ( aSnapRect.GetHeight() > 1 );
bool bCellObject = ( aSnapRect.GetWidth() > 1 ) && ( aSnapRect.GetHeight() > 1 );
if ( bCellObject )
{
std::set< sal_Int32 >::const_iterator aRowIter( rRows.find( aSnapRect.Top() ) );
std::set< sal_Int32 >::const_iterator aColumnIter( rColumns.find( aSnapRect.Left() ) );
if ( ( aRowIter == rRows.end() ) || ( aColumnIter == rColumns.end() ) )
bCellObject = sal_False;
bCellObject = false;
else
{
nRowCount = 1;
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 567e6d6..8072fe6 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -71,42 +71,42 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi
mnInterfacePageId(0),
mnViewPageId(0),
mnGeneralPageId(0),
mbIsPresentation( sal_False ),
mbIsWriter( sal_False ),
mbIsPresentation( false ),
mbIsWriter( false ),
mbSelectionPresent( sal_False ),
mbUseCTLFont( sal_False ),
mbUseLosslessCompression( sal_True ),
mbSelectionPresent( false ),
mbUseCTLFont( false ),
mbUseLosslessCompression( true ),
mnQuality( 90 ),
mbReduceImageResolution( sal_False ),
mbReduceImageResolution( false ),
mnMaxImageResolution( 300 ),
mbUseTaggedPDF( sal_False ),
mbExportNotes( sal_True ),
mbViewPDF( sal_False ),
mbExportNotesPages( sal_False ),
mbUseTransitionEffects( sal_False ),
mbIsSkipEmptyPages( sal_True ),
mbAddStream( sal_False ),
mbUseTaggedPDF( false ),
mbExportNotes( true ),
mbViewPDF( false ),
mbExportNotesPages( false ),
mbUseTransitionEffects( false ),
mbIsSkipEmptyPages( true ),
mbAddStream( false ),
mnFormsType( 0 ),
mbExportFormFields( sal_True ),
mbAllowDuplicateFieldNames( sal_False ),
mbExportBookmarks( sal_True ),
mbExportHiddenSlides ( sal_False),
mbExportFormFields( true ),
mbAllowDuplicateFieldNames( false ),
mbExportBookmarks( true ),
mbExportHiddenSlides ( false),
mnOpenBookmarkLevels( -1 ),
mbHideViewerToolbar( sal_False ),
mbHideViewerMenubar( sal_False ),
mbHideViewerWindowControls( sal_False ),
mbResizeWinToInit( sal_False ),
mbCenterWindow( sal_False ),
mbOpenInFullScreenMode( sal_False ),
mbDisplayPDFDocumentTitle( sal_False ),
mbHideViewerToolbar( false ),
mbHideViewerMenubar( false ),
mbHideViewerWindowControls( false ),
mbResizeWinToInit( false ),
mbCenterWindow( false ),
mbOpenInFullScreenMode( false ),
mbDisplayPDFDocumentTitle( false ),
mnMagnification( 0 ),
mnInitialView( 0 ),
mnZoom( 0 ),
mnInitialPage( 1 ),
mnPageLayout( 0 ),
mbFirstPageLeft( sal_False ),
mbFirstPageLeft( false ),
mbEncrypt( false ),
mbRestrictPermissions( false ),
@@ -115,16 +115,16 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi
mbCanCopyOrExtract( false ),
mbCanExtractForAccessibility( true ),
mbIsRangeChecked( sal_False ),
mbIsRangeChecked( false ),
msPageRange( ' ' ),
mbSelectionIsChecked( sal_False ),
mbExportRelativeFsysLinks( sal_False ),
mbSelectionIsChecked( false ),
mbExportRelativeFsysLinks( false ),
mnViewPDFMode( 0 ),
mbConvertOOoTargets( sal_False ),
mbExportBmkToPDFDestination( sal_False ),
mbConvertOOoTargets( false ),
mbExportBmkToPDFDestination( false ),
mbSignPDF( sal_False )
mbSignPDF( false )
{
// check for selection
@@ -153,12 +153,12 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi
{
sal_Int32 nLen = xIndexAccess->getCount();
if ( !nLen )
mbSelectionPresent = sal_False;
mbSelectionPresent = false;
else if ( nLen == 1 )
{
Reference< text::XTextRange > xTextRange( xIndexAccess->getByIndex( 0 ), UNO_QUERY );
if ( xTextRange.is() && ( xTextRange->getString().isEmpty() ) )
mbSelectionPresent = sal_False;
mbSelectionPresent = false;
}
}
}
@@ -171,9 +171,9 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFi
if ( xInfo.is() )
{
if ( xInfo->supportsService( "com.sun.star.presentation.PresentationDocument" ) )
mbIsPresentation = sal_True;
mbIsPresentation = true;
if ( xInfo->supportsService( "com.sun.star.text.GenericTextDocument" ) )
mbIsWriter = sal_True;
mbIsWriter = true;
}
}
catch(const RuntimeException &)
@@ -574,7 +574,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
mpCbExportEmptyPages->Enable( mbIsWriter );
mpRbLosslessCompression->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleCompressionHdl ) );
const sal_Bool bUseLosslessCompression = paParent->mbUseLosslessCompression;
const bool bUseLosslessCompression = paParent->mbUseLosslessCompression;
if ( bUseLosslessCompression )
mpRbLosslessCompression->Check();
else
@@ -584,7 +584,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
mpQualityFrame->Enable(!bUseLosslessCompression);
mpCbReduceImageResolution->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl ) );
const sal_Bool bReduceImageResolution = paParent->mbReduceImageResolution;
const bool bReduceImageResolution = paParent->mbReduceImageResolution;
mpCbReduceImageResolution->Check( bReduceImageResolution );
OUString aStrRes = OUString::number( paParent->mnMaxImageResolution ) + " DPI";
mpCoReduceImageResolution->SetText( aStrRes );
@@ -669,10 +669,10 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
paParent->mbIsSkipEmptyPages = !mpCbExportEmptyPages->IsChecked();
paParent->mbAddStream = mpCbAddStream->IsVisible() && mpCbAddStream->IsChecked();
paParent->mbIsRangeChecked = sal_False;
paParent->mbIsRangeChecked = false;
if( mpRbRange->IsChecked() )
{
paParent->mbIsRangeChecked = sal_True;
paParent->mbIsRangeChecked = true;
paParent->msPageRange = mpEdPages->GetText(); //FIXME all right on other languages ?
}
else if( mpRbSelection->IsChecked() )
@@ -1292,7 +1292,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
// This tab page is under control of the PDF/A-1a checkbox:
// implement a method to do it.
void ImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity )
void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity )
{
if( bEnableSecurity )
{
@@ -1312,9 +1312,9 @@ ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent,
const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",rCoreSet ),
mbOpnLnksDefaultUserState( sal_False ),
mbOpnLnksLaunchUserState( sal_False ),
mbOpnLnksBrowserUserState( sal_False )
mbOpnLnksDefaultUserState( false ),
mbOpnLnksLaunchUserState( false ),
mbOpnLnksBrowserUserState( false )
{
get(m_pCbExprtBmkrToNmDst,"export");
get(m_pCbOOoToPDFTargets ,"convert");
@@ -1380,15 +1380,15 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
default:
case 0:
m_pRbOpnLnksDefault->Check();
mbOpnLnksDefaultUserState = sal_True;
mbOpnLnksDefaultUserState = true;
break;
case 1:
m_pRbOpnLnksLaunch->Check();
mbOpnLnksLaunchUserState = sal_True;
mbOpnLnksLaunchUserState = true;
break;
case 2:
m_pRbOpnLnksBrowser->Check();
mbOpnLnksBrowserUserState = sal_True;
mbOpnLnksBrowserUserState = true;
break;
}
// now check the status of PDF/A selection
@@ -1403,7 +1403,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
// called from general tab, with PDFA/1 selection status
// retrieves/store the status of Launch action selection
void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch )
void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch )
{
// set the value and position of link type selection
if( bEnableLaunch )
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 0d737ed..c8a317b 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -90,64 +90,64 @@ private:
protected:
//the following data are the configuration used throughout the dialog and pages
sal_Bool mbIsPresentation;
sal_Bool mbIsWriter;
sal_Bool mbSelectionPresent;
sal_Bool mbUseCTLFont;
sal_Bool mbUseLosslessCompression;
bool mbIsPresentation;
bool mbIsWriter;
bool mbSelectionPresent;
bool mbUseCTLFont;
bool mbUseLosslessCompression;
sal_Int32 mnQuality;
sal_Bool mbReduceImageResolution;
bool mbReduceImageResolution;
sal_Int32 mnMaxImageResolution;
sal_Bool mbUseTaggedPDF;
bool mbUseTaggedPDF;
sal_Int32 mnPDFTypeSelection;
sal_Bool mbExportNotes;
sal_Bool mbViewPDF;
sal_Bool mbExportNotesPages;
sal_Bool mbUseTransitionEffects;
sal_Bool mbIsSkipEmptyPages;
sal_Bool mbAddStream;
bool mbExportNotes;
bool mbViewPDF;
bool mbExportNotesPages;
bool mbUseTransitionEffects;
bool mbIsSkipEmptyPages;
bool mbAddStream;
sal_Int32 mnFormsType;
sal_Bool mbExportFormFields;
sal_Bool mbAllowDuplicateFieldNames;
sal_Bool mbExportBookmarks;
sal_Bool mbExportHiddenSlides;
bool mbExportFormFields;
bool mbAllowDuplicateFieldNames;
bool mbExportBookmarks;
bool mbExportHiddenSlides;
sal_Int32 mnOpenBookmarkLevels;
sal_Bool mbHideViewerToolbar;
sal_Bool mbHideViewerMenubar;
sal_Bool mbHideViewerWindowControls;
sal_Bool mbResizeWinToInit;
sal_Bool mbCenterWindow;
sal_Bool mbOpenInFullScreenMode;
sal_Bool mbDisplayPDFDocumentTitle;
bool mbHideViewerToolbar;
bool mbHideViewerMenubar;
bool mbHideViewerWindowControls;
bool mbResizeWinToInit;
bool mbCenterWindow;
bool mbOpenInFullScreenMode;
bool mbDisplayPDFDocumentTitle;
sal_Int32 mnMagnification;
sal_Int32 mnInitialView;
sal_Int32 mnZoom;
sal_Int32 mnInitialPage;
sal_Int32 mnPageLayout;
sal_Bool mbFirstPageLeft;
bool mbFirstPageLeft;
sal_Bool mbEncrypt;
bool mbEncrypt;
sal_Bool mbRestrictPermissions;
bool mbRestrictPermissions;
com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > maPreparedOwnerPassword;
sal_Int32 mnPrint;
sal_Int32 mnChangesAllowed;
sal_Bool mbCanCopyOrExtract;
sal_Bool mbCanExtractForAccessibility;
bool mbCanCopyOrExtract;
bool mbCanExtractForAccessibility;
com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords;
sal_Bool mbIsRangeChecked;
bool mbIsRangeChecked;
OUString msPageRange;
sal_Bool mbSelectionIsChecked;
bool mbSelectionIsChecked;
sal_Bool mbExportRelativeFsysLinks;
bool mbExportRelativeFsysLinks;
sal_Int32 mnViewPDFMode;
sal_Bool mbConvertOOoTargets;
sal_Bool mbExportBmkToPDFDestination;
bool mbConvertOOoTargets;
bool mbExportBmkToPDFDestination;
sal_Bool mbSignPDF;
bool mbSignPDF;
OUString msSignPassword;
OUString msSignLocation;
OUString msSignContact;
@@ -271,7 +271,7 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage
RadioButton* mpRbPgLyContinueFacing;
CheckBox* mpCbPgLyFirstOnLeft;
sal_Bool mbUseCTLFont;
bool mbUseCTLFont;
DECL_LINK( ToggleRbPgLyContinueFacingHdl, void* );
DECL_LINK( ToggleRbMagnHdl, void* );
@@ -302,7 +302,7 @@ class ImpPDFTabViewerPage : public SfxTabPage
CheckBox* m_pCbHideViewerWindowControls;
CheckBox* m_pCbTransitionEffects;
sal_Bool mbIsPresentation;
bool mbIsPresentation;
RadioButton* m_pRbAllBookmarkLevels;
RadioButton* m_pRbVisibleBookmarkLevels;
@@ -374,7 +374,7 @@ public:
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
void ImplPDFASecurityControl( sal_Bool bEnableSecurity );
void ImplPDFASecurityControl( bool bEnableSecurity );
bool hasPassword() const { return mbHaveOwnerPassword || mbHaveUserPassword; }
};
@@ -386,11 +386,11 @@ class ImpPDFTabLinksPage : public SfxTabPage
CheckBox* m_pCbExportRelativeFsysLinks;
RadioButton* m_pRbOpnLnksDefault;
sal_Bool mbOpnLnksDefaultUserState;
bool mbOpnLnksDefaultUserState;
RadioButton* m_pRbOpnLnksLaunch;
sal_Bool mbOpnLnksLaunchUserState;
bool mbOpnLnksLaunchUserState;
RadioButton* m_pRbOpnLnksBrowser;
sal_Bool mbOpnLnksBrowserUserState;
bool mbOpnLnksBrowserUserState;
DECL_LINK( ClickRbOpnLnksDefaultHdl, void* );
DECL_LINK( ClickRbOpnLnksBrowserHdl, void* );
@@ -406,7 +406,7 @@ public:
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
void ImplPDFALinkControl( sal_Bool bEnableLaunch );
void ImplPDFALinkControl( bool bEnableLaunch );
};
//class to implement the digital signing
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index b4c415c..8aceae6 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -97,54 +97,54 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
mxContext ( xContext ),
mxStatusIndicator ( rxStatusIndicator ),
mxIH ( rxIH ),
mbUseTaggedPDF ( sal_False ),
mbUseTaggedPDF ( false ),
mnPDFTypeSelection ( 0 ),
mbExportNotes ( sal_True ),
mbViewPDF ( sal_True ),
mbExportNotesPages ( sal_False ),
mbUseTransitionEffects ( sal_True ),
mbExportBookmarks ( sal_True ),
mbExportHiddenSlides ( sal_False ),
mbExportNotes ( true ),
mbViewPDF ( true ),
mbExportNotesPages ( false ),
mbUseTransitionEffects ( true ),
mbExportBookmarks ( true ),
mbExportHiddenSlides ( false ),
mnOpenBookmarkLevels ( -1 ),
mbUseLosslessCompression ( sal_False ),
mbReduceImageResolution ( sal_True ),
mbSkipEmptyPages ( sal_True ),
mbAddStream ( sal_False ),
mbUseLosslessCompression ( false ),
mbReduceImageResolution ( true ),
mbSkipEmptyPages ( true ),
mbAddStream ( false ),
mnMaxImageResolution ( 300 ),
mnQuality ( 90 ),
mnFormsFormat ( 0 ),
mbExportFormFields ( sal_True ),
mbAllowDuplicateFieldNames ( sal_False ),
mbExportFormFields ( true ),
mbAllowDuplicateFieldNames ( false ),
mnProgressValue ( 0 ),
mbRemoveTransparencies ( sal_False ),
mbWatermark ( sal_False ),
mbRemoveTransparencies ( false ),
mbWatermark ( false ),
mbHideViewerToolbar ( sal_False ),
mbHideViewerMenubar ( sal_False ),
mbHideViewerWindowControls ( sal_False ),
mbFitWindow ( sal_False ),
mbCenterWindow ( sal_False ),
mbOpenInFullScreenMode ( sal_False ),
mbDisplayPDFDocumentTitle ( sal_True ),
mbHideViewerToolbar ( false ),
mbHideViewerMenubar ( false ),
mbHideViewerWindowControls ( false ),
mbFitWindow ( false ),
mbCenterWindow ( false ),
mbOpenInFullScreenMode ( false ),
mbDisplayPDFDocumentTitle ( true ),
mnPDFDocumentMode ( 0 ),
mnPDFDocumentAction ( 0 ),
mnZoom ( 100 ),
mnInitialPage ( 1 ),
mnPDFPageLayout ( 0 ),
mbFirstPageLeft ( sal_False ),
mbFirstPageLeft ( false ),
mbEncrypt ( sal_False ),
mbRestrictPermissions ( sal_False ),
mbEncrypt ( false ),
mbRestrictPermissions ( false ),
mnPrintAllowed ( 2 ),
mnChangesAllowed ( 4 ),
mbCanCopyOrExtract ( sal_True ),
mbCanExtractForAccessibility( sal_True ),
mbCanCopyOrExtract ( true ),
mbCanExtractForAccessibility( true ),
//--->i56629
mbExportRelativeFsysLinks ( sal_False ),
mbExportRelativeFsysLinks ( false ),
mnDefaultLinkAction ( 0 ),
mbConvertOOoTargetToPDFTarget( sal_False ),
mbExportBmkToDest ( sal_False ),
mbConvertOOoTargetToPDFTarget( false ),
mbExportBmkToDest ( false ),
mbSignPDF ( false )
{
}
@@ -157,20 +157,20 @@ PDFExport::~PDFExport()
sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
Reference< com::sun::star::view::XRenderable >& rRenderable,
const Any& rSelection,
const StringRangeEnumerator& rRangeEnum,
Sequence< PropertyValue >& rRenderOptions,
sal_Int32 nPageCount )
{
sal_Bool bRet = sal_False;
bool bRet = false;
try
{
Any* pFirstPage = NULL;
Any* pLastPage = NULL;
sal_Bool bExportNotesPages = sal_False;
bool bExportNotesPages = false;
for( sal_Int32 nData = 0, nDataCount = rRenderOptions.getLength(); nData < nDataCount; ++nData )
{
@@ -248,7 +248,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
}
else
{
bRet = sal_True; // #i18334# SJ: nPageCount == 0,
bRet = true; // #i18334# SJ: nPageCount == 0,
rPDFWriter.NewPage( 10000, 10000 ); // creating dummy page
rPDFWriter.SetMapMode( MAP_100TH_MM );
}
@@ -375,10 +375,10 @@ static OUString getMimetypeForDocument( const Reference< XComponentContext >& xC
return aDocMimetype;
}
sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData )
bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData )
{
INetURLObject aURL( rFile );
sal_Bool bRet = sal_False;
bool bRet = false;
std::set< PDFWriter::ErrorCode > aErrors;
@@ -507,7 +507,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
else if ( rFilterData[ nData ].Name == "Watermark" )
{
maWatermark = rFilterData[ nData ].Value;
mbWatermark = sal_True;
mbWatermark = true;
}
//now all the security related properties...
else if ( rFilterData[ nData ].Name == "EncryptFile" )
@@ -570,13 +570,13 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
case 1:
aContext.Version = PDFWriter::PDF_A_1;
//force the tagged PDF as well
mbUseTaggedPDF = sal_True;
mbUseTaggedPDF = true;
//force disabling of form conversion
mbExportFormFields = sal_False;
mbExportFormFields = false;
// PDF/A does not allow transparencies
mbRemoveTransparencies = sal_True;
mbRemoveTransparencies = true;
// no encryption
mbEncrypt = sal_False;
mbEncrypt = false;
xEnc.clear();
break;
}
@@ -662,7 +662,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
// if not enabled and no permission password, force permissions to default as if PDF where without encryption
if( mbRestrictPermissions && (xEnc.is() || !aPermissionPassword.isEmpty()) )
{
mbEncrypt = sal_True;
mbEncrypt = true;
//permission set as desired, done after
}
else
@@ -670,8 +670,8 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
//force permission to default
mnPrintAllowed = 2 ;
mnChangesAllowed = 4 ;
mbCanCopyOrExtract = sal_True;
mbCanExtractForAccessibility = sal_True ;
mbCanCopyOrExtract = true;
mbCanExtractForAccessibility = true ;
}
switch( mnPrintAllowed )
@@ -843,7 +843,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
aSelection = Any();
aSelection <<= mxSrcDoc;
}
sal_Bool bSecondPassForImpressNotes = sal_False;
bool bSecondPassForImpressNotes = false;
bool bReChangeToNormalView = false;
OUString sShowOnlineLayout( "ShowOnlineLayout" );
uno::Reference< beans::XPropertySet > xViewProperties;
@@ -873,7 +873,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
{
uno::Reference< drawing::XShapes > xShapes; // sj: do not allow to export notes when
if ( ! ( aSelection >>= xShapes ) ) // exporting a selection -> todo: in the dialog
bSecondPassForImpressNotes = sal_True; // the export notes checkbox needs to be disabled
bSecondPassForImpressNotes = true; // the export notes checkbox needs to be disabled
}
if( aPageRange.isEmpty() )
@@ -897,7 +897,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
if( nPageCount > 0 )
bRet = ExportSelection( *pPDFWriter, xRenderable, aSelection, aRangeEnum, aRenderOptions, nPageCount );
else
bRet = sal_False;
bRet = false;
if ( bRet && bSecondPassForImpressNotes )
{
@@ -997,12 +997,12 @@ void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors )
sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf )
bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf )
{
const Size aSizePDF( OutputDevice::LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_POINT ) );
Point aOrigin;
Rectangle aPageRect( aOrigin, rMtf.GetPrefSize() );
sal_Bool bRet = sal_True;
bool bRet = true;
rWriter.NewPage( aSizePDF.Width(), aSizePDF.Height() );
rWriter.SetMapMode( rMtf.GetPrefMapMode() );
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index 48791e1..38a050d 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -44,65 +44,65 @@ private:
Reference< task::XStatusIndicator > mxStatusIndicator;
Reference< task::XInteractionHandler > mxIH;
sal_Bool mbUseTaggedPDF;
bool mbUseTaggedPDF;
sal_Int32 mnPDFTypeSelection;
sal_Bool mbExportNotes;
sal_Bool mbViewPDF;
sal_Bool mbExportNotesPages;
sal_Bool mbUseTransitionEffects;
sal_Bool mbExportBookmarks;
sal_Bool mbExportHiddenSlides;
bool mbExportNotes;
bool mbViewPDF;
bool mbExportNotesPages;
bool mbUseTransitionEffects;
bool mbExportBookmarks;
bool mbExportHiddenSlides;
sal_Int32 mnOpenBookmarkLevels;
sal_Bool mbUseLosslessCompression;
sal_Bool mbReduceImageResolution;
sal_Bool mbSkipEmptyPages;
sal_Bool mbAddStream;
bool mbUseLosslessCompression;
bool mbReduceImageResolution;
bool mbSkipEmptyPages;
bool mbAddStream;
sal_Int32 mnMaxImageResolution;
sal_Int32 mnQuality;
sal_Int32 mnFormsFormat;
sal_Bool mbExportFormFields;
sal_Bool mbAllowDuplicateFieldNames;
bool mbExportFormFields;
bool mbAllowDuplicateFieldNames;
sal_Int32 mnProgressValue;
sal_Bool mbRemoveTransparencies;
bool mbRemoveTransparencies;
sal_Bool mbWatermark;
bool mbWatermark;
uno::Any maWatermark;
//these variable are here only to have a location in filter/pdf to set the default
//to be used by the macro (when the FilterData are set by the macro itself)
sal_Bool mbHideViewerToolbar;
sal_Bool mbHideViewerMenubar;
sal_Bool mbHideViewerWindowControls;
sal_Bool mbFitWindow;
sal_Bool mbCenterWindow;
sal_Bool mbOpenInFullScreenMode;
sal_Bool mbDisplayPDFDocumentTitle;
bool mbHideViewerToolbar;
bool mbHideViewerMenubar;
bool mbHideViewerWindowControls;
bool mbFitWindow;
bool mbCenterWindow;
bool mbOpenInFullScreenMode;
bool mbDisplayPDFDocumentTitle;
sal_Int32 mnPDFDocumentMode;
sal_Int32 mnPDFDocumentAction;
sal_Int32 mnZoom;
sal_Int32 mnInitialPage;
sal_Int32 mnPDFPageLayout;
sal_Bool mbFirstPageLeft;
bool mbFirstPageLeft;
sal_Bool mbEncrypt;
sal_Bool mbRestrictPermissions;
bool mbEncrypt;
bool mbRestrictPermissions;
sal_Int32 mnPrintAllowed;
sal_Int32 mnChangesAllowed;
sal_Bool mbCanCopyOrExtract;
sal_Bool mbCanExtractForAccessibility;
bool mbCanCopyOrExtract;
bool mbCanExtractForAccessibility;
SvtGraphicFill maCacheFill;
//--->i56629
sal_Bool mbExportRelativeFsysLinks;
bool mbExportRelativeFsysLinks;
sal_Int32 mnDefaultLinkAction;
sal_Bool mbConvertOOoTargetToPDFTarget;
sal_Bool mbExportBmkToDest;
sal_Bool ImplExportPage( ::vcl::PDFWriter& rWriter, ::vcl::PDFExtOutDevData& rPDFExtOutDevData,
bool mbConvertOOoTargetToPDFTarget;
bool mbExportBmkToDest;
bool ImplExportPage( ::vcl::PDFWriter& rWriter, ::vcl::PDFExtOutDevData& rPDFExtOutDevData,
const GDIMetaFile& rMtf );
sal_Bool mbSignPDF;
bool mbSignPDF;
OUString msSignLocation;
OUString msSignContact;
OUString msSignReason;
@@ -118,14 +118,14 @@ public:
const Reference< uno::XComponentContext >& xFact );
~PDFExport();
sal_Bool ExportSelection( vcl::PDFWriter& rPDFWriter,
bool ExportSelection( vcl::PDFWriter& rPDFWriter,
Reference< com::sun::star::view::XRenderable >& rRenderable,
const Any& rSelection,
const StringRangeEnumerator& rRangeEnum,
Sequence< PropertyValue >& rRenderOptions,
sal_Int32 nPageCount );
sal_Bool Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData );
bool Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData );
void showErrors( const std::set<vcl::PDFWriter::ErrorCode>& );
};
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index fce746f..31332b3 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -36,13 +36,13 @@ PDFFilter::~PDFFilter()
{
}
sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
{
Reference< XOutputStream > xOStm;
Sequence< PropertyValue > aFilterData;
sal_Int32 nLength = rDescriptor.getLength();
const PropertyValue* pValue = rDescriptor.getConstArray();
sal_Bool bRet = sal_False;
bool bRet = false;
Reference< task::XStatusIndicator > xStatusIndicator;
Reference< task::XInteractionHandler > xIH;
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescripto
{
FocusWindowWaitCursor aCur;
const sal_Bool bRet = implExport( rDescriptor );
const bool bRet = implExport( rDescriptor );
return bRet;
}
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index 629d1ea4..584405a 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -66,7 +66,7 @@ private:
Reference< XComponentContext > mxContext;
Reference< XComponent > mxSrcDoc;
sal_Bool implExport( const Sequence< PropertyValue >& rDescriptor );
bool implExport( const Sequence< PropertyValue >& rDescriptor );
protected:
@@ -98,7 +98,7 @@ OUString PDFFilter_getImplementationName ()
sal_Bool SAL_CALL PDFFilter_supportsService( const OUString& ServiceName )
bool SAL_CALL PDFFilter_supportsService( const OUString& ServiceName )
throw ( RuntimeException );
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index 5f16d50..579d9ef 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -43,7 +43,7 @@ void SAL_CALL PDFInteractionHandler::handle( const Reference< task::XInteraction
sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Reference< task::XInteractionRequest >& i_xRequest )
throw (RuntimeException, std::exception)
{
sal_Bool bHandled = sal_False;
bool bHandled = false;
Any aRequest( i_xRequest->getRequest() );
task::PDFExportException aExc;
@@ -55,7 +55,7 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
aCodes.insert( (vcl::PDFWriter::ErrorCode)aExc.ErrorCodes.getConstArray()[i] );
ImplErrorDialog aDlg( aCodes );
aDlg.Execute();
bHandled = sal_True;
bHandled = true;
}
return bHandled;
}
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index 72217af..cbe46a1 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -61,7 +61,7 @@ OUString PDFInteractionHandler_getImplementationName ()
sal_Bool SAL_CALL PDFInteractionHandler_supportsService( const OUString& ServiceName )
bool SAL_CALL PDFInteractionHandler_supportsService( const OUString& ServiceName )
throw ( RuntimeException );
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index a87821c..cc38e35 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -284,20 +284,20 @@ static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZi
//#define PLACEWARE_DEBUG 1
sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOutputStream > xOutputStream,
bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOutputStream > xOutputStream,
const OUString& rURL, Reference < XInterface > /* xHandler */, Reference < XStatusIndicator >& xStatusIndicator )
{
sal_Bool bRet = sal_False;
bool bRet = false;
mxGraphicExporter = GraphicExportFilter::create( mxContext );
Reference< XDrawPagesSupplier > xDrawPagesSupplier(xDoc, UNO_QUERY);
if(!xDrawPagesSupplier.is())
return sal_False;
return false;
Reference< XIndexAccess > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY );
if(!xDrawPages.is())
return sal_False;
return false;
if(xStatusIndicator.is())
{
@@ -319,7 +319,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
#endif
if( osl::File::E_None != nRC )
return sal_False;
return false;
vector< PageEntry* > aPageEntries;
@@ -377,7 +377,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
encodeFile( aTempFile, xOutputStream );
bRet = sal_True;
bRet = true;
}
catch ( RuntimeException const & )
{
@@ -428,7 +428,7 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
Reference< XPropertySet > xPropSet( xShape, UNO_QUERY );
if( xPropSet.is() )
{
sal_Bool bIsEmpty = true;
bool bIsEmpty = true;
xPropSet->getPropertyValue( szIsEmptyPresObj ) >>= bIsEmpty;
if( !bIsEmpty )
@@ -463,7 +463,7 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
Reference< XPropertySet > xPropSet( xShape, UNO_QUERY );
if( xPropSet.is() )
{
sal_Bool bIsEmpty = true;
bool bIsEmpty = true;
xPropSet->getPropertyValue( szIsEmptyPresObj ) >>= bIsEmpty;
if( !bIsEmpty )
@@ -486,7 +486,7 @@ PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
aFilterData[0].Name = "Width";
aFilterData[0].Value <<= (sal_Int32)704;
aFilterData[1].Name = "Translucent";
aFilterData[1].Value <<= (sal_Bool)sal_False;
aFilterData[1].Value <<= false;
Sequence< PropertyValue > aDescriptor( 3 );
aDescriptor[0].Name = "FilterName";
diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx
index 4cf8b93..8d352e6 100644
--- a/filter/source/placeware/exporter.hxx
+++ b/filter/source/placeware/exporter.hxx
@@ -35,7 +35,7 @@ public:
PlaceWareExporter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~PlaceWareExporter();
sal_Bool doExport( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc,
bool doExport( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc,
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOutputStream,
const OUString& rURL,
::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > xHandler,
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index 1da05e4..1f41db4 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -45,7 +45,7 @@ ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterD
maBTCancel( this ),
maBTHelp( this ),
maConfigItem( SVG_EXPORTFILTER_CONFIGPATH, &rFilterData ),
mbOldNativeDecoration( sal_False )
mbOldNativeDecoration( false )
{
SetText( "SVG Export Options" );
SetOutputSizePixel( Size( implMap( *this, 177 ), implMap( *this, 77 ) ) );
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index f6bc522..7add6c8 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -58,7 +58,7 @@ private:
HelpButton maBTHelp;
FilterConfigItem maConfigItem;
sal_Bool mbOldNativeDecoration;
bool mbOldNativeDecoration;
DECL_LINK( OnToggleCheckbox, CheckBox* );
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index 2903ba9..5cc335b 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -83,7 +83,7 @@ OUString SVGDialog_getImplementationName ()
sal_Bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName )
bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 87d78ed..244d08b 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -112,7 +112,7 @@ public:
{
return OUString( "TextField" );
}
virtual sal_Bool equalTo( const TextField & aTextField ) const = 0;
virtual bool equalTo( const TextField & aTextField ) const = 0;
virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const = 0;
virtual void elementExport( SVGExport* pSVGExport ) const
{
@@ -149,7 +149,7 @@ public:
{
return OUString( "FixedTextField" );
}
virtual sal_Bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE
virtual bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE
{
if( const FixedTextField* aFixedTextField = dynamic_cast< const FixedTextField* >( &aTextField ) )
{
@@ -220,7 +220,7 @@ public:
{
return OUString( "VariableDateTimeField" );
}
virtual sal_Bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE
virtual bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE
{
if( const VariableDateTimeField* aField = dynamic_cast< const VariableDateTimeField* >( &aTextField ) )
{
@@ -305,7 +305,7 @@ public:
virtual ~VariableDateTimeField() {}
};
sal_Bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField )
bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField )
{
return aLhsTextField.equalTo( aRhsTextField );
}
@@ -347,7 +347,7 @@ SVGExport::SVGExport(
else
{
if(!(iter->second >>= mbIsEmbedFonts))
mbIsEmbedFonts = sal_False;
mbIsEmbedFonts = false;
}
// Native Decoration
@@ -417,7 +417,7 @@ ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentatio
sal_Bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const
bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const
{
return( ( mxObject == rPresentation.mxObject ) &&
( *mpMtf == *rPresentation.mpMtf ) );
@@ -523,7 +523,7 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
// - SVGFilter -
sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ) ;
@@ -531,7 +531,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
boost::scoped_ptr<SvStream> pOStm;
sal_Int32 nLength = rDescriptor.getLength();
const PropertyValue* pValue = rDescriptor.getConstArray();
sal_Bool bRet = sal_False;
bool bRet = false;
maFilterData.realloc( 0 );
@@ -621,7 +621,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
mpSVGExport = NULL; // pointed object is released by xSVGExport dtor at the end of this scope
delete mpSVGFontExport, mpSVGFontExport = NULL;
delete mpObjects, mpObjects = NULL;
mbPresentation = sal_False;
mbPresentation = false;
}
}
}
@@ -647,7 +647,7 @@ Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference
sal_Bool SVGFilter::implLookForFirstVisiblePage()
bool SVGFilter::implLookForFirstVisiblePage()
{
sal_Int32 nCurPage = 0, nLastPage = mSelectedPages.getLength() - 1;
@@ -661,7 +661,7 @@ sal_Bool SVGFilter::implLookForFirstVisiblePage()
if( xPropSet.is() )
{
sal_Bool bVisible = sal_False;
bool bVisible = false;
if( !mbPresentation || mbSinglePage ||
( ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible ) && bVisible ) )
@@ -677,12 +677,12 @@ sal_Bool SVGFilter::implLookForFirstVisiblePage()
}
sal_Bool SVGFilter::implExportDocument()
bool SVGFilter::implExportDocument()
{
OUString aAttr;
sal_Int32 nDocX = 0, nDocY = 0; // #i124608#
sal_Int32 nDocWidth = 0, nDocHeight = 0;
sal_Bool bRet = sal_False;
bool bRet = false;
sal_Int32 nLastPage = mSelectedPages.getLength() - 1;
SvtMiscOptions aMiscOptions;
@@ -872,7 +872,7 @@ sal_Bool SVGFilter::implExportDocument()
}
delete mpSVGDoc, mpSVGDoc = NULL;
bRet = sal_True;
bRet = true;
}
}
@@ -891,14 +891,14 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
const OUString & sOOOElemField,
Reference< XDrawPage > xMasterPage )
{
sal_Bool bFound = sal_False;
bool bFound = false;
sal_Int32 i;
sal_Int32 nSize = aFieldSet.size();
for( i = 0; i < nSize; ++i )
{
if( *(aFieldSet[i]) == aField )
{
bFound = sal_True;
bFound = true;
break;
}
}
@@ -915,9 +915,9 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
sal_Bool SVGFilter::implGenerateMetaData()
bool SVGFilter::implGenerateMetaData()
{
sal_Bool bRet = sal_False;
bool bRet = false;
sal_Int32 nCount = mSelectedPages.getLength();
if( nCount != 0 )
{
@@ -999,12 +999,12 @@ sal_Bool SVGFilter::implGenerateMetaData()
if( xPropSet.is() )
{
sal_Bool bBackgroundVisibility = sal_True; // default: visible
sal_Bool bBackgroundObjectsVisibility = sal_True; // default: visible
sal_Bool bPageNumberVisibility = sal_False; // default: hidden
sal_Bool bDateTimeVisibility = sal_True; // default: visible
sal_Bool bFooterVisibility = sal_True; // default: visible
sal_Bool bDateTimeFixed = sal_True; // default: fixed
bool bBackgroundVisibility = true; // default: visible
bool bBackgroundObjectsVisibility = true; // default: visible
bool bPageNumberVisibility = false; // default: hidden
bool bDateTimeVisibility = true; // default: visible
bool bFooterVisibility = true; // default: visible
bool bDateTimeFixed = true; // default: fixed
FixedDateTimeField aFixedDateTimeField;
VariableDateTimeField aVariableDateTimeField;
@@ -1126,7 +1126,7 @@ sal_Bool SVGFilter::implGenerateMetaData()
}
}
}
bRet = sal_True;
bRet = true;
}
return bRet;
@@ -1134,9 +1134,9 @@ sal_Bool SVGFilter::implGenerateMetaData()
sal_Bool SVGFilter::implExportAnimations()
bool SVGFilter::implExportAnimations()
{
sal_Bool bRet = sal_False;
bool bRet = false;
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "presentation-animations" );
SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
@@ -1150,7 +1150,7 @@ sal_Bool SVGFilter::implExportAnimations()
sal_Int16 nTransition = 0;
xProps->getPropertyValue( "TransitionType" ) >>= nTransition;
// we have a slide transition ?
sal_Bool bHasEffects = ( nTransition != 0 );
bool bHasEffects = ( nTransition != 0 );
Reference< XAnimationNodeSupplier > xAnimNodeSupplier( mSelectedPages[i], UNO_QUERY );
if( xAnimNodeSupplier.is() )
@@ -1194,7 +1194,7 @@ sal_Bool SVGFilter::implExportAnimations()
}
}
bRet = sal_True;
bRet = true;
return bRet;
}
@@ -1276,7 +1276,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat
* We export bitmaps embedded into text shapes, such as those used by list
* items with image style, only once in a specic <defs> element.
*/
sal_Bool SVGFilter::implExportTextEmbeddedBitmaps()
bool SVGFilter::implExportTextEmbeddedBitmaps()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "TextEmbeddedBitmaps" );
SvXMLElementExport aDefsContainerElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
@@ -1322,23 +1322,23 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps()
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: no shape bounding box." );
return sal_False;
return false;
}
}
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: metafile should have MetaBmpExScaleAction only." );
return sal_False;
return false;
}
}
else
{
OSL_FAIL( "implExportTextEmbeddedBitmaps: metafile should have a single action." );
return sal_False;
return false;
}
}
return sal_True;
return true;
}
@@ -1346,7 +1346,7 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps()
#define SVGFILTER_EXPORT_SVGSCRIPT( z, n, aFragment ) \
xExtDocHandler->unknown( OUString::createFromAscii( aFragment ## n ) );
sal_Bool SVGFilter::implGenerateScript()
bool SVGFilter::implGenerateScript()
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "type", "text/ecmascript" );
@@ -1360,7 +1360,7 @@ sal_Bool SVGFilter::implGenerateScript()
}
}
return sal_True;
return true;
}
@@ -1386,9 +1386,9 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
* This method is used when exporting a single page
* as implGenerateMetaData is not invoked.
*/
sal_Bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
{
sal_Bool bRet = sal_False;
bool bRet = false;
mVisiblePagePropSet.bIsBackgroundVisible = true;
mVisiblePagePropSet.bAreBackgroundObjectsVisible = true;
@@ -1434,7 +1434,7 @@ sal_Bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
}
}
bRet = sal_True;
bRet = true;
}
}
@@ -1444,7 +1444,7 @@ sal_Bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & rxPages,
bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage )
{
DBG_ASSERT( nFirstPage <= nLastPage,
@@ -1455,7 +1455,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence &
OUString aContainerTag = (mbSinglePage) ? OUString( "g" ) : OUString( "defs" );
SvXMLElementExport aContainerElement( *mpSVGExport, XML_NAMESPACE_NONE, aContainerTag, true, true );
sal_Bool bRet = sal_False;
bool bRet = false;
for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i )
{
if( rxPages[i].is() )
@@ -1468,7 +1468,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence &
const OUString & sPageId = implGetValidIDFromInterface( rxPages[i] );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sPageId );
bRet = implExportPage( sPageId, rxPages[i], xShapes, sal_True /* is a master page */ ) || bRet;
bRet = implExportPage( sPageId, rxPages[i], xShapes, true /* is a master page */ ) || bRet;
}
}
}
@@ -1477,7 +1477,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence &
sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages,
bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage )
{
DBG_ASSERT( nFirstPage <= nLastPage,
@@ -1487,7 +1487,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "SlideGroup" );
SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
sal_Bool bRet = sal_False;
bool bRet = false;
for( sal_Int32 i = nFirstPage; i <= nLastPage; ++i )
{
Reference< XShapes > xShapes;
@@ -1529,7 +1529,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx
SvXMLElementExport aSlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
bRet = implExportPage( sPageId, rxPages[i], xShapes, sal_False /* is not a master page */ ) || bRet;
bRet = implExportPage( sPageId, rxPages[i], xShapes, false /* is not a master page */ ) || bRet;
}
} // append the </g> closing tag related to the svg element handling the slide visibility
}
@@ -1538,12 +1538,12 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx
}
sal_Bool SVGFilter::implExportPage( const OUString & sPageId,
bool SVGFilter::implExportPage( const OUString & sPageId,
const Reference< XDrawPage > & rxPage,
const Reference< XShapes > & xShapes,
sal_Bool bMaster )
bool bMaster )
{
sal_Bool bRet = sal_False;
bool bRet = false;
{
OUString sPageName = implGetInterfaceName( rxPage );
@@ -1642,11 +1642,11 @@ sal_Bool SVGFilter::implExportPage( const OUString & sPageId,
sal_Bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
sal_Bool bMaster )
bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
bool bMaster )
{
Reference< XShape > xShape;
sal_Bool bRet = sal_False;
bool bRet = false;
for( sal_Int32 i = 0, nCount = rxShapes->getCount(); i < nCount; ++i )
{
@@ -1661,16 +1661,16 @@ sal_Bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
sal_Bool bMaster )
bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
bool bMaster )
{
Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY );
sal_Bool bRet = sal_False;
bool bRet = false;
if( xShapePropSet.is() )
{
const OUString aShapeType( rxShape->getShapeType() );
sal_Bool bHideObj = sal_False;
bool bHideObj = false;
if( mbPresentation )
{
@@ -1716,9 +1716,9 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
// and set visibility to hidden
if( mbPresentation )
{
sal_Bool bIsPageNumber = ( aShapeClass == "Slide_Number" );
sal_Bool bIsFooter = ( aShapeClass == "Footer" );
sal_Bool bIsDateTime = ( aShapeClass == "Date/Time" );
bool bIsPageNumber = ( aShapeClass == "Slide_Number" );
bool bIsFooter = ( aShapeClass == "Footer" );
bool bIsDateTime = ( aShapeClass == "Date/Time" );
if( bIsPageNumber || bIsDateTime || bIsFooter )
{
if( !mbSinglePage )
@@ -1825,7 +1825,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
}
}
bRet = sal_True;
bRet = true;
}
}
}
@@ -1835,7 +1835,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
sal_Bool SVGFilter::implCreateObjects()
bool SVGFilter::implCreateObjects()
{
if (mbExportSelection)
{
@@ -1843,9 +1843,9 @@ sal_Bool SVGFilter::implCreateObjects()
if (mSelectedPages.getLength() && mSelectedPages[0].is())
{
implCreateObjectsFromShapes(mSelectedPages[0], maShapeSelection);
return sal_True;
return true;
}
return sal_False;
return false;
}
sal_Int32 i, nCount;
@@ -1897,15 +1897,15 @@ sal_Bool SVGFilter::implCreateObjects()
implCreateObjectsFromShapes( xDrawPage, xDrawPage );
}
}
return sal_True;
return true;
}
sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes )
bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes )
{
Reference< XShape > xShape;
sal_Bool bRet = sal_False;
bool bRet = false;
for( sal_Int32 i = 0, nCount = rxShapes->getCount(); i < nCount; ++i )
{
@@ -1920,9 +1920,9 @@ sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > &
sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape )
bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape )
{
sal_Bool bRet = sal_False;
bool bRet = false;
if( rxShape->getShapeType().lastIndexOf( "drawing.GroupShape" ) != -1 )
{
Reference< XShapes > xShapes( rxShape, UNO_QUERY );
@@ -1957,7 +1957,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
if( aGraphic.GetGDIMetaFile().GetActionSize() )
{
Reference< XText > xText( rxShape, UNO_QUERY );
sal_Bool bIsTextShape = xText.is();
bool bIsTextShape = xText.is();
if( !mpSVGExport->IsUsePositionedCharacters() && bIsTextShape )
{
@@ -1965,7 +1965,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
if( xShapePropSet.is() )
{
sal_Bool bHideObj = sal_False;
bool bHideObj = false;
if( mbPresentation )
{
@@ -1987,7 +1987,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
GDIMetaFile aMtf;
const Size aSize( pObj->GetCurrentBoundRect().GetSize() );
MetaAction* pAction;
sal_Bool bIsTextShapeStarted = sal_False;
bool bIsTextShapeStarted = false;
const GDIMetaFile& rMtf = aGraphic.GetGDIMetaFile();
sal_uLong nCount = rMtf.GetActionSize();
for( sal_uLong nCurAction = 0; nCurAction < nCount; ++nCurAction )
@@ -2000,11 +2000,11 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
if( ( pA->GetComment().equalsIgnoreAsciiCase("XTEXT_PAINTSHAPE_BEGIN") ) )
{
bIsTextShapeStarted = sal_True;
bIsTextShapeStarted = true;
}
else if( ( pA->GetComment().equalsIgnoreAsciiCase( "XTEXT_PAINTSHAPE_END" ) ) )
{
bIsTextShapeStarted = sal_False;
bIsTextShapeStarted = false;
}
}
if( bIsTextShapeStarted && ( nType == META_BMPSCALE_ACTION || nType == META_BMPEXSCALE_ACTION ) )
@@ -2028,7 +2028,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
}
(*mpObjects)[ rxShape ] = ObjectRepresentation( rxShape, aGraphic.GetGDIMetaFile() );
}
bRet = sal_True;
bRet = true;
}
}
}
@@ -2038,7 +2038,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
{
Reference< XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( mxContext );
@@ -2053,7 +2053,7 @@ sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage
aDescriptor[1].Name = "URL";
aDescriptor[1].Value <<= OUString( aFile.GetURL() );
aDescriptor[2].Name = "ExportOnlyBackground";
aDescriptor[2].Value <<= (sal_Bool) sal_True;
aDescriptor[2].Value <<= true;
xExporter->setSourceDocument( Reference< XComponent >( rxDrawPage, UNO_QUERY ) );
xExporter->filter( aDescriptor );
@@ -2061,7 +2061,7 @@ sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage
(*mpObjects)[ rxDrawPage ] = ObjectRepresentation( rxDrawPage, aMtf );
return sal_True;
return true;
}
@@ -2127,7 +2127,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
{
sal_Bool bFieldProcessed = sal_False;
bool bFieldProcessed = false;
if( pInfo && mbPresentation )
{
bFieldProcessed = true;
@@ -2145,7 +2145,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
OSL_FAIL( "error: !mCreateOjectsCurrentMasterPage.is()" );
return 0;
}
sal_Bool bHasCharSetMap = !( mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) == mTextFieldCharSets.end() );
bool bHasCharSetMap = !( mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) == mTextFieldCharSets.end() );
static const OUString aHeaderId( aOOOAttrHeaderField );
static const OUString aFooterId( aOOOAttrFooterField );
@@ -2285,7 +2285,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
}
else
{
bFieldProcessed = sal_False;
bFieldProcessed = false;
}
if( bFieldProcessed )
{
@@ -2302,7 +2302,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
}
else
{
bFieldProcessed = sal_False;
bFieldProcessed = false;
}
}
else // single page case
@@ -2350,7 +2350,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
}
else
{
bFieldProcessed = sal_False;
bFieldProcessed = false;
}
if( bFieldProcessed )
{
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 994329b..734b01a 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -65,8 +65,8 @@ SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) :
mpSVGWriter( NULL ),
mpDefaultSdrPage( NULL ),
mpSdrModel( NULL ),
mbPresentation( sal_False ),
mbSinglePage( sal_False ),
mbPresentation( false ),
mbSinglePage( false ),
mnVisiblePage( -1 ),
mpObjects( NULL ),
mxSrcDoc(),
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
{
SolarMutexGuard aGuard;
Window* pFocusWindow = Application::GetFocusWindow();
sal_Bool bRet;
bool bRet;
if( pFocusWindow )
pFocusWindow->EnterWait();
@@ -104,7 +104,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
else if( mxSrcDoc.is() )
{
// #i124608# detext selection
sal_Bool bSelectionOnly = sal_False;
bool bSelectionOnly = false;
bool bGotSelection(false);
// #i124608# extract Single selection wanted from dialog return values
@@ -253,7 +253,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
// #i124608# export selection, got maShapeSelection but no shape selected -> nothing
// to export, we are done (maybe return true, but a hint that nothing was done
// may be useful; it may have happened by error)
bRet = sal_False;
bRet = false;
}
else {
/*
@@ -283,7 +283,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
}
#endif
else
bRet = sal_False;
bRet = false;
if( pFocusWindow )
pFocusWindow->LeaveWait();
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index e43eeaa..7b68c2b 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -105,11 +105,11 @@ class SVGExport : public SvXMLExport
{
typedef ::std::list< ::basegfx::B2DPolyPolygon > B2DPolyPolygonList;
sal_Bool mbIsUseTinyProfile;
sal_Bool mbIsEmbedFonts;
sal_Bool mbIsUseOpacity;
sal_Bool mbIsUseNativeTextDecoration;
sal_Bool mbIsUsePositionedCharacters;
bool mbIsUseTinyProfile;
bool mbIsEmbedFonts;
bool mbIsUseOpacity;
bool mbIsUseNativeTextDecoration;
bool mbIsUsePositionedCharacters;
public:
@@ -119,11 +119,11 @@ public:
virtual ~SVGExport();
sal_Bool IsUseTinyProfile() const { return mbIsUseTinyProfile; };
sal_Bool IsEmbedFonts() const { return mbIsEmbedFonts; };
sal_Bool IsUseOpacity() const { return mbIsUseOpacity; };
sal_Bool IsUseNativeTextDecoration() const { return mbIsUseNativeTextDecoration; };
sal_Bool IsUsePositionedCharacters() const { return mbIsUsePositionedCharacters; };
bool IsUseTinyProfile() const { return mbIsUseTinyProfile; };
bool IsEmbedFonts() const { return mbIsEmbedFonts; };
bool IsUseOpacity() const { return mbIsUseOpacity; };
bool IsUseNativeTextDecoration() const { return mbIsUseNativeTextDecoration; };
bool IsUsePositionedCharacters() const { return mbIsUsePositionedCharacters; };
void writeMtf( const GDIMetaFile& rMtf );
@@ -156,23 +156,23 @@ public:
~ObjectRepresentation();
ObjectRepresentation& operator=( const ObjectRepresentation& rPresentation );
sal_Bool operator==( const ObjectRepresentation& rPresentation ) const;
bool operator==( const ObjectRepresentation& rPresentation ) const;
const Reference< XInterface >& GetObject() const { return mxObject; }
sal_Bool HasRepresentation() const { return mpMtf != NULL; }
bool HasRepresentation() const { return mpMtf != NULL; }
const GDIMetaFile& GetRepresentation() const { return *mpMtf; }
};
struct PagePropertySet
{
sal_Bool bIsBackgroundVisible;
sal_Bool bAreBackgroundObjectsVisible;
sal_Bool bIsPageNumberFieldVisible;
sal_Bool bIsDateTimeFieldVisible;
sal_Bool bIsFooterFieldVisible;
sal_Bool bIsHeaderFieldVisible;
bool bIsBackgroundVisible;
bool bAreBackgroundObjectsVisible;
bool bIsPageNumberFieldVisible;
bool bIsDateTimeFieldVisible;
bool bIsFooterFieldVisible;
bool bIsHeaderFieldVisible;
sal_Int32 nPageNumberingType;
sal_Bool bIsDateTimeFieldFixed;
bool bIsDateTimeFieldFixed;
sal_Int16 nPageNumber;
sal_Int32 nDateTimeFormat;
OUString sDateTimeText;
@@ -241,8 +241,8 @@ private:
SVGActionWriter* mpSVGWriter;
SdrPage* mpDefaultSdrPage;
SdrModel* mpSdrModel;
sal_Bool mbPresentation;
sal_Bool mbSinglePage;
bool mbPresentation;
bool mbSinglePage;
sal_Int32 mnVisiblePage;
PagePropertySet mVisiblePagePropSet;
OUString msClipPathId;
@@ -266,46 +266,46 @@ private:
Link maOldFieldHdl;
sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
sal_Bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
Reference< XWriter > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
sal_Bool implGetPagePropSet( const Reference< XDrawPage > & rxPage );
sal_Bool implGenerateMetaData();
bool implGetPagePropSet( const Reference< XDrawPage > & rxPage );
bool implGenerateMetaData();
void implExportTextShapeIndex();
void implEmbedBulletGlyphs();
void implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData );
sal_Bool implExportTextEmbeddedBitmaps();
sal_Bool implGenerateScript();
bool implExportTextEmbeddedBitmaps();
bool implGenerateScript();
sal_Bool implExportDocument();
sal_Bool implExportAnimations();
bool implExportDocument();
bool implExportAnimations();
sal_Bool implExportMasterPages( const XDrawPageSequence& rxPages,
bool implExportMasterPages( const XDrawPageSequence& rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage );
sal_Bool implExportDrawPages( const XDrawPageSequence& rxPages,
bool implExportDrawPages( const XDrawPageSequence& rxPages,
sal_Int32 nFirstPage, sal_Int32 nLastPage );
sal_Bool implExportPage( const OUString & sPageId,
bool implExportPage( const OUString & sPageId,
const Reference< XDrawPage > & rxPage,
const Reference< XShapes > & xShapes,
sal_Bool bMaster );
bool bMaster );
sal_Bool implExportShapes( const Reference< XShapes >& rxShapes,
sal_Bool bMaster );
sal_Bool implExportShape( const Reference< XShape >& rxShape,
sal_Bool bMaster );
bool implExportShapes( const Reference< XShapes >& rxShapes,
bool bMaster );
bool implExportShape( const Reference< XShape >& rxShape,
bool bMaster );
sal_Bool implCreateObjects();
sal_Bool implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes );
sal_Bool implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape );
sal_Bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
bool implCreateObjects();
bool implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes );
bool implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape );
bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage );
OUString implGetClassFromShape( const Reference< XShape >& rxShape );
void implRegisterInterface( const Reference< XInterface >& rxIf );
const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf );
OUString implGetInterfaceName( const Reference< XInterface >& rxIf );
sal_Bool implLookForFirstVisiblePage();
bool implLookForFirstVisiblePage();
Any implSafeGetPagePropSet( const OUString & sPropertyName,
const Reference< XPropertySet > & rxPropSet,
const Reference< XPropertySetInfo > & rxPropSetInfo );
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index edf34da..565a87d 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -236,7 +236,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont )
const Point aPos;
const PolyPolygon aMissingGlyphPolyPoly( Rectangle( aPos, aSize ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, sal_False ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, false ) );
{
SvXMLElementExport aExp4( mrExport, XML_NAMESPACE_NONE, "missing-glyph", true, true );
@@ -277,7 +277,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr
mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::number( aBoundRect.GetWidth() ) );
const OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) );
const OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, false ) );
if( !aPathString.isEmpty() )
{
mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", aPathString );
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index d61603e..45ab0b8 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -45,7 +45,7 @@
using namespace ::com::sun::star;
using namespace ::svgi;
sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
utl::MediaDescriptor aMediaDescriptor(rDescriptor);
@@ -59,12 +59,12 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
{
uno::Reference<io::XSeekable> xSeek(xInputStream, uno::UNO_QUERY);
if (!xSeek.is())
return sal_False;
return false;
xSeek->seek(0);
boost::scoped_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInputStream, true ));
if(!aStream.get())
return sal_False;
return false;
SvStream* pMemoryStream = new SvMemoryStream;
GZCodec aCodec;
@@ -74,7 +74,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
pMemoryStream->Seek(STREAM_SEEK_TO_BEGIN);
uno::Reference<io::XInputStream> xDecompressedInput(new utl::OSeekableInputStreamWrapper(pMemoryStream, true));
if (!xDecompressedInput.is())
return sal_False;
return false;
xInputStream = xDecompressedInput;
}
else
@@ -86,7 +86,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
OSL_ASSERT(xInputStream.is());
if(!xInputStream.is())
return sal_False;
return false;
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( mxContext->getServiceManager()->createInstanceWithContext( sXMLImportService, mxContext ), UNO_QUERY );
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index b4eabbe3..da2ae3d 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1877,7 +1877,7 @@ SVGReader::SVGReader(const uno::Reference<uno::XComponentContext>& xContext,
{
}
sal_Bool SVGReader::parseAndConvert()
bool SVGReader::parseAndConvert()
{
uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder = xml::dom::DocumentBuilder::create(m_xContext);
@@ -2080,7 +2080,7 @@ sal_Bool SVGReader::parseAndConvert()
m_xDocumentHandler->endElement( "office:document" );
m_xDocumentHandler->endDocument();
return sal_True;
return true;
}
} // namespace svgi
diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx
index 04b63c0..61e52a5 100644
--- a/filter/source/svg/svgreader.hxx
+++ b/filter/source/svg/svgreader.hxx
@@ -30,7 +30,7 @@ public:
const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
FILTER_DLLPUBLIC sal_Bool parseAndConvert();
FILTER_DLLPUBLIC bool parseAndConvert();
};
} // namespace svgi
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 75ee522..79a7e82 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -410,7 +410,7 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport )
: mrExport( rExport ),
mpContext( NULL ),
mpVDev( NULL ),
mbIsTextShapeStarted( sal_False ),
mbIsTextShapeStarted( false ),
mrTextShape(),
msShapeId(),
mrParagraphEnumeration(),
@@ -425,17 +425,17 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport )
mnLeftTextPortionLength( 0 ),
maTextPos(0,0),
mnTextWidth(0),
mbPositioningNeeded( sal_False ),
mbIsNewListItem( sal_False ),
mbPositioningNeeded( false ),
mbIsNewListItem( false ),
meNumberingType(0),
mcBulletChar(0),
maBulletListItemMap(),
mbIsListLevelStyleImage( sal_False ),
mbLineBreak( sal_False ),
mbIsURLField( sal_False ),
mbIsListLevelStyleImage( false ),
mbLineBreak( false ),
mbIsURLField( false ),
msUrl(),
mbIsPlacehlolderShape( sal_False ),
mbIWS( sal_False ),
mbIsPlacehlolderShape( false ),
mbIWS( false ),
maCurrentFont(),
maParentFont()
{
@@ -491,7 +491,7 @@ void SVGTextWriter::implSetCurrentFont()
}
template< typename SubType >
sal_Bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty )
bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& raPos, bool& rbEmpty )
{
const SubType* pA = (const SubType*) pAction;
sal_uInt16 nLength = pA->GetLen();
@@ -499,13 +499,13 @@ sal_Bool SVGTextWriter::implGetTextPosition( const MetaAction* pAction, Point& r
if( !rbEmpty )
{
raPos = pA->GetPoint();
return sal_True;
return true;
}
return sal_False;
return false;
}
template<>
sal_Bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty )
bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaAction* pAction, Point& raPos, bool& rbEmpty )
{
const MetaTextRectAction* pA = (const MetaTextRectAction*) pAction;
sal_uInt16 nLength = pA->GetText().getLength();
@@ -513,18 +513,18 @@ sal_Bool SVGTextWriter::implGetTextPosition<MetaTextRectAction>( const MetaActio
if( !rbEmpty )
{
raPos = pA->GetRect().TopLeft();
return sal_True;
return true;
}
return sal_False;
return false;
}
template< typename SubType >
sal_Bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty )
bool SVGTextWriter::implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, bool& rbEmpty )
{
const SubType* pA = (const SubType*) pAction;
raPos = pA->GetPoint();
rbEmpty = sal_False;
return sal_True;
rbEmpty = false;
return true;
}
/** setTextPosition
@@ -542,11 +542,11 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
{
Point aPos;
sal_uLong nCount = rMtf.GetActionSize();
sal_Bool bEOL = sal_False;
sal_Bool bEOP = sal_False;
sal_Bool bETS = sal_False;
sal_Bool bConfigured = sal_False;
sal_Bool bEmpty = sal_True;
bool bEOL = false;
bool bEOP = false;
bool bETS = false;
bool bConfigured = false;
bool bEmpty = true;
sal_uLong nActionIndex = nCurAction + 1;
for( ; nActionIndex < nCount; ++nActionIndex )
@@ -617,7 +617,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
else
{
if( sContent.equalsAscii( "\n" ) )
mbLineBreak = sal_True;
mbLineBreak = true;
}
}
if( nextParagraph() )
@@ -632,7 +632,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
else
{
if( sContent.equalsAscii( "\n" ) )
mbLineBreak = sal_True;
mbLineBreak = true;
}
}
}
@@ -662,8 +662,8 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC
void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction )
{
sal_uLong nCount = rMtf.GetActionSize();
sal_Bool bEOP = sal_False;
sal_Bool bConfigured = sal_False;
bool bEOP = false;
bool bConfigured = false;
for( sal_uLong nActionIndex = nCurAction + 1; nActionIndex < nCount; ++nActionIndex )
{
const MetaAction* pAction = rMtf.GetAction( nActionIndex );
@@ -726,7 +726,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc
}
}
void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer )
void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
{
implSetCurrentFont();
@@ -845,7 +845,7 @@ void SVGTextWriter::implSetFontFamily()
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, sFontFamily );
}
sal_Bool SVGTextWriter::createParagraphEnumeration()
bool SVGTextWriter::createParagraphEnumeration()
{
if( mrTextShape.is() )
{
@@ -856,7 +856,7 @@ sal_Bool SVGTextWriter::createParagraphEnumeration()
if( xEnumeration.is() )
{
mrParagraphEnumeration.set( xEnumeration );
return sal_True;
return true;
}
else
{
@@ -867,15 +867,15 @@ sal_Bool SVGTextWriter::createParagraphEnumeration()
{
OSL_FAIL( "SVGTextWriter::createParagraphEnumeration: no valid XText interface found." );
}
return sal_False;
return false;
}
sal_Bool SVGTextWriter::nextParagraph()
bool SVGTextWriter::nextParagraph()
{
mrTextPortionEnumeration.clear();
mrCurrentTextParagraph.clear();
mbIsNewListItem = sal_False;
mbIsListLevelStyleImage = sal_False;
mbIsNewListItem = false;
mbIsListLevelStyleImage = false;
if( mrParagraphEnumeration.is() && mrParagraphEnumeration->hasMoreElements() )
{
@@ -898,7 +898,7 @@ sal_Bool SVGTextWriter::nextParagraph()
sal_Int16 nListLevel = 0;
if( xPropSet->getPropertyValue( "NumberingLevel" ) >>= nListLevel )
{
mbIsNewListItem = sal_True;
mbIsNewListItem = true;
#if OSL_DEBUG_LEVEL > 0
sInfo = "NumberingLevel: " + OUString::number( nListLevel );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "style", sInfo );
@@ -910,14 +910,14 @@ sal_Bool SVGTextWriter::nextParagraph()
}
if( xNumRules.is() && ( nListLevel < xNumRules->getCount() ) )
{
sal_Bool bIsNumbered = sal_True;
bool bIsNumbered = true;
OUString msNumberingIsNumber("NumberingIsNumber");
if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) )
{
if( !(xPropSet->getPropertyValue( msNumberingIsNumber ) >>= bIsNumbered ) )
{
OSL_FAIL( "numbered paragraph without number info" );
bIsNumbered = sal_False;
bIsNumbered = false;
}
#if OSL_DEBUG_LEVEL > 0
if( bIsNumbered )
@@ -1000,7 +1000,7 @@ sal_Bool SVGTextWriter::nextParagraph()
else
{
OSL_FAIL( "SVGTextWriter::nextParagraph: Unknown text content." );
return sal_False;
return false;
}
#if OSL_DEBUG_LEVEL > 0
mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", sInfo );
@@ -1010,7 +1010,7 @@ sal_Bool SVGTextWriter::nextParagraph()
else
{
OSL_FAIL( "SVGTextWriter::nextParagraph: no XServiceInfo interface available for text content." );
return sal_False;
return false;
}
const OUString& rParagraphId = implGetValidIDFromInterface( xTextContent );
@@ -1018,18 +1018,18 @@ sal_Bool SVGTextWriter::nextParagraph()
{
mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId );
}
return sal_True;
return true;
}
}
return sal_False;
return false;
}
sal_Bool SVGTextWriter::nextTextPortion()
bool SVGTextWriter::nextTextPortion()
{
mrCurrentTextPortion.clear();
mbIsURLField = sal_False;
mbIsPlacehlolderShape = sal_False;
mbIsURLField = false;
mbIsPlacehlolderShape = false;
if( mrTextPortionEnumeration.is() && mrTextPortionEnumeration->hasMoreElements() )
{
#if OSL_DEBUG_LEVEL > 0
@@ -1098,7 +1098,7 @@ sal_Bool SVGTextWriter::nextTextPortion()
if( sFieldName.equalsAscii( "DateTime" ) || sFieldName.equalsAscii( "Header" )
|| sFieldName.equalsAscii( "Footer" ) || sFieldName.equalsAscii( "PageNumber" ) )
{
mbIsPlacehlolderShape = sal_True;
mbIsPlacehlolderShape = true;
}
else
{
@@ -1140,11 +1140,11 @@ sal_Bool SVGTextWriter::nextTextPortion()
SvXMLElementExport aPortionElem( mrExport, XML_NAMESPACE_NONE, "desc", mbIWS, mbIWS );
mrExport.GetDocHandler()->characters( sInfo );
#endif
return sal_True;
return true;
}
}
return sal_False;
return false;
}
void SVGTextWriter::startTextShape()
@@ -1155,7 +1155,7 @@ void SVGTextWriter::startTextShape()
}
{
mbIsTextShapeStarted = sal_True;
mbIsTextShapeStarted = true;
maParentFont = Font();
mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextShape" );
mpTextShapeElem = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemText, true, mbIWS );
@@ -1177,7 +1177,7 @@ void SVGTextWriter::endTextShape()
delete mpTextShapeElem;
mpTextShapeElem = NULL;
}
mbIsTextShapeStarted = sal_False;
mbIsTextShapeStarted = false;
// these need to be invoked after the <text> element has been closed
implExportHyperlinkIds();
implWriteBulletChars();
@@ -1224,9 +1224,9 @@ void SVGTextWriter::endTextParagraph()
{
mrCurrentTextPortion.clear();
endTextPosition();
mbIsNewListItem = sal_False;
mbIsListLevelStyleImage = sal_False;
mbPositioningNeeded = sal_False;
mbIsNewListItem = false;
mbIsListLevelStyleImage = false;
mbPositioningNeeded = false;
if( mpTextParagraphElem )
{
@@ -1236,7 +1236,7 @@ void SVGTextWriter::endTextParagraph()
}
void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY )
void SVGTextWriter::startTextPosition( bool bExportX, bool bExportY )
{
endTextPosition();
mnTextWidth = 0;
@@ -1351,11 +1351,11 @@ void SVGTextWriter::writeBitmapPlaceholder( const MetaBitmapActionType* pAction
const Point& rPos = pAction->GetPoint();
implMap( rPos, maTextPos );
startTextPosition();
mbPositioningNeeded = sal_True;
mbPositioningNeeded = true;
if( mbIsNewListItem )
{
mbIsNewListItem = sal_False;
mbIsListLevelStyleImage = sal_False;
mbIsNewListItem = false;
mbIsListLevelStyleImage = false;
}
// bitmap placeholder element
@@ -1450,12 +1450,12 @@ void SVGTextWriter::implWriteEmbeddedBitmaps()
void SVGTextWriter::writeTextPortion( const Point& rPos,
const OUString& rText,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
if( rText.isEmpty() )
return;
mbLineBreak = sal_False;
mbLineBreak = false;
if( !mbIsNewListItem || mbIsListLevelStyleImage )
{
@@ -1494,7 +1494,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
if( sContent.isEmpty() )
continue;
if( sContent.equalsAscii( "\n" ) )
mbLineBreak = sal_True;
mbLineBreak = true;
if( sContent.match( rText, nStartPos ) )
bNotSync = false;
}
@@ -1520,7 +1520,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
void SVGTextWriter::implWriteTextPortion( const Point& rPos,
const OUString& rText,
Color aTextColor,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
Point aPos;
Point aBaseLinePos( rPos );
@@ -1539,7 +1539,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
if( mbPositioningNeeded )
{
mbPositioningNeeded = sal_False;
mbPositioningNeeded = false;
maTextPos.setX( aPos.X() );
maTextPos.setY( aPos.Y() );
startTextPosition();
@@ -1550,7 +1550,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
// so we end the current line and start a new one.
if( mbLineBreak || ( ( maTextPos.X() + mnTextWidth ) > aPos.X() ) )
{
mbLineBreak = sal_False;
mbLineBreak = false;
maTextPos.setX( aPos.X() );
maTextPos.setY( aPos.Y() );
startTextPosition();
@@ -1558,14 +1558,14 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
else // superscript, subscript, list item numbering
{
maTextPos.setY( aPos.Y() );
startTextPosition( sal_False /* do not export x attribute */ );
startTextPosition( false /* do not export x attribute */ );
}
}
// we are dealing with a bullet, so set up this for the next text portion
if( mbIsNewListItem )
{
mbIsNewListItem = sal_False;
mbPositioningNeeded = sal_True;
mbIsNewListItem = false;
mbPositioningNeeded = true;
if( meNumberingType == NumberingType::CHAR_SPECIAL )
{
@@ -1601,7 +1601,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
if( mbIsPlacehlolderShape )
{
mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" );
mbIsPlacehlolderShape = sal_False;
mbIsPlacehlolderShape = false;
}
addFontAttributes( /* isTexTContainer: */ false );
@@ -1642,7 +1642,7 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport
mpContext( NULL ),
maTextWriter( rExport ),
mnInnerMtfCount( 0 ),
mbClipAttrChanged( sal_False )
mbClipAttrChanged( false )
{
mpVDev = new VirtualDevice;
mpVDev->EnableOutput( false );
@@ -1708,7 +1708,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon
return( rDstPolyPoly );
}
OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine )
OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, bool bLine )
{
OUString aPathData;
const OUString aBlank( " " );
@@ -1783,7 +1783,7 @@ sal_uLong SVGActionWriter::GetChecksum( const MetaAction* pAction )
}
void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
const Color* pLineColor, sal_Bool bApplyMapping )
const Color* pLineColor, bool bApplyMapping )
{
Point aPt1, aPt2;
@@ -1815,7 +1815,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
}
void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
Rectangle aRect;
@@ -1841,7 +1841,7 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
}
void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
Point aCenter;
@@ -1861,7 +1861,7 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
}
void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
if ( !rAttrs.IsDefault() )
{
@@ -1915,8 +1915,8 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs,
}
void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly,
sal_Bool bApplyMapping )
void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, bool bLineOnly,
bool bApplyMapping )
{
PolyPolygon aPolyPoly;
@@ -1934,7 +1934,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
}
}
void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool bApplyMapping )
void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bApplyMapping )
{
PolyPolygon aPolyPoly;
@@ -1943,7 +1943,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
else
aPolyPoly = rShape.maShapePolyPoly;
const sal_Bool bLineOnly = ( rShape.maShapeFillColor == Color( COL_TRANSPARENT ) ) && ( !rShape.mapShapeGradient.get() );
const bool bLineOnly = ( rShape.maShapeFillColor == Color( COL_TRANSPARENT ) ) && ( !rShape.mapShapeGradient.get() );
Rectangle aBoundRect( aPolyPoly.GetBoundRect() );
mpContext->AddPaintAttr( rShape.maShapeLineColor, rShape.maShapeFillColor, &aBoundRect, rShape.mapShapeGradient.get() );
@@ -2022,7 +2022,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeDashArray, aDashArrayStr );
}
ImplWritePolyPolygon( aPolyPoly, bLineOnly, sal_False );
ImplWritePolyPolygon( aPolyPoly, bLineOnly, false );
}
void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
@@ -2078,7 +2078,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
OUString aPatternStyle = "fill:url(#" + aPatternId + ")";
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aPatternStyle );
ImplWritePolyPolygon( rPolyPoly, sal_False );
ImplWritePolyPolygon( rPolyPoly, false );
}
}
@@ -2199,7 +2199,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
OUString aGradientStyle = "fill:url(#" + aGradientId + ")";
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, aGradientStyle );
ImplWritePolyPolygon( rPolyPoly, sal_False );
ImplWritePolyPolygon( rPolyPoly, false );
}
}
@@ -2307,7 +2307,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
const sal_Int32* pDXArray, long nWidth,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
const FontMetric aMetric( mpVDev->GetFontMetric() );
@@ -2397,7 +2397,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
const sal_Int32* pDXArray, long nWidth,
Color aTextColor, sal_Bool bApplyMapping )
Color aTextColor, bool bApplyMapping )
{
sal_Int32 nLen = rText.getLength();
Size aNormSize;
@@ -2452,7 +2452,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
// for each line of text there should be at least one group element
SvXMLElementExport aSVGGElem( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, false );
sal_Bool bIsPlaceholderField = sal_False;
bool bIsPlaceholderField = false;
if( mbIsPlacehlolderShape )
{
@@ -2499,7 +2499,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
sal_Int32 nCurPos = 0, nLastPos = 0, nX = aPos.X();
// write single glyphs at absolute text positions
for( sal_Bool bCont = sal_True; bCont; )
for( bool bCont = true; bCont; )
{
sal_Int32 nCount = 1;
@@ -2564,7 +2564,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
ImplWritePolyPolygon( aPoly, sal_False );
ImplWritePolyPolygon( aPoly, false );
}
if( rFont.GetUnderline() )
@@ -2576,7 +2576,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
ImplWritePolyPolygon( aPoly, sal_False );
ImplWritePolyPolygon( aPoly, false );
}
}
}
@@ -2585,7 +2585,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
const Point& rPt, const Size& rSz,
const Point& rSrcPt, const Size& rSrcSz,
sal_Bool bApplyMapping )
bool bApplyMapping )
{
if( !!rBmpEx )
{
@@ -2829,7 +2829,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( aPoly.GetSize() )
{
mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
ImplWritePolyPolygon( aPoly, sal_False );
ImplWritePolyPolygon( aPoly, false );
}
}
}
@@ -2846,7 +2846,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
mpContext->AddPaintAttr( mpVDev->GetLineColor(), Color( COL_TRANSPARENT ) );
ImplAddLineAttr( pA->GetLineInfo() );
ImplWritePolyPolygon( rPoly, sal_True );
ImplWritePolyPolygon( rPoly, true );
}
}
}
@@ -2862,7 +2862,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( rPolyPoly.Count() )
{
mpContext->AddPaintAttr( mpVDev->GetLineColor(), mpVDev->GetFillColor() );
ImplWritePolyPolygon( rPolyPoly, sal_False );
ImplWritePolyPolygon( rPolyPoly, false );
}
}
}
@@ -2916,7 +2916,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
aNewFillColor.SetTransparency( sal::static_int_cast<sal_uInt8>( FRound( pA->GetTransparence() * 2.55 ) ) );
mpContext->AddPaintAttr( aNewLineColor, aNewFillColor );
ImplWritePolyPolygon( rPolyPoly, sal_False );
ImplWritePolyPolygon( rPolyPoly, false );
}
}
}
@@ -2940,7 +2940,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
{
const MetaEPSAction* pA = (const MetaEPSAction*) pAction;
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
sal_Bool bFound = sal_False;
bool bFound = false;
for( sal_uInt32 k = 0, nCount2 = aGDIMetaFile.GetActionSize(); ( k < nCount2 ) && !bFound; ++k )
{
@@ -2948,7 +2948,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
{
bFound = sal_True;
bFound = true;
const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*) pSubstAct;
ImplWriteBmp( pBmpScaleAction->GetBitmap(),
pA->GetPoint(), pA->GetSize(),
@@ -2967,7 +2967,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( nWriteFlags & SVGWRITER_WRITE_FILL ) )
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
bool bDone = false;
while( !bDone && ( ++nCurAction < nCount ) )
{
@@ -2979,7 +2979,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( ( (const MetaCommentAction*) pAction )->GetComment().
equalsIgnoreAsciiCase("XGRAD_SEQ_END") ) )
{
bDone = sal_True;
bDone = true;
}
}
@@ -3002,10 +3002,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
ReadSvtGraphicFill( aMemStm, aFill );
sal_Bool bGradient = SvtGraphicFill::fillGradient == aFill.getFillType() &&
bool bGradient = SvtGraphicFill::fillGradient == aFill.getFillType() &&
( SvtGraphicFill::gradientLinear == aFill.getGradientType() ||
SvtGraphicFill::gradientRadial == aFill.getGradientType() );
sal_Bool bSkip = ( SvtGraphicFill::fillSolid == aFill.getFillType() || bGradient );
bool bSkip = ( SvtGraphicFill::fillSolid == aFill.getFillType() || bGradient );
if( bSkip )
{
@@ -3037,7 +3037,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( ( (const MetaCommentAction*) pAction )->GetComment().
equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
{
bSkip = sal_False;
bSkip = false;
}
else if( pAction->GetType() == META_GRADIENTEX_ACTION )
{
@@ -3053,7 +3053,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
}
else
bSkip = sal_False;
bSkip = false;
}
// skip rest of comment
@@ -3065,7 +3065,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( ( (const MetaCommentAction*) pAction )->GetComment().
equalsIgnoreAsciiCase("XPATHFILL_SEQ_END") ) )
{
bSkip = sal_False;
bSkip = false;
}
}
}
@@ -3195,7 +3195,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
}
// skip rest of comment
sal_Bool bSkip = true;
bool bSkip = true;
while( bSkip && ( ++nCurAction < nCount ) )
{
@@ -3205,7 +3205,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( ( (const MetaCommentAction*) pAction )->GetComment().
equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_END") ) )
{
bSkip = sal_False;
bSkip = false;
}
}
}
@@ -3513,7 +3513,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
case( META_MOVECLIPREGION_ACTION ):
{
( (MetaAction*) pAction )->Execute( mpVDev );
mbClipAttrChanged = sal_True;
mbClipAttrChanged = true;
}
break;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 64cd570..d824132 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -190,7 +190,7 @@ class SVGTextWriter
SVGExport& mrExport;
SVGAttributeWriter* mpContext;
VirtualDevice* mpVDev;
sal_Bool mbIsTextShapeStarted;
bool mbIsTextShapeStarted;
Reference<XText> mrTextShape;
OUString msShapeId;
Reference<XEnumeration> mrParagraphEnumeration;
@@ -205,18 +205,18 @@ class SVGTextWriter
sal_Int32 mnLeftTextPortionLength;
Point maTextPos;
long int mnTextWidth;
sal_Bool mbPositioningNeeded;
sal_Bool mbIsNewListItem;
bool mbPositioningNeeded;
bool mbIsNewListItem;
sal_Int16 meNumberingType;
sal_Unicode mcBulletChar;
BulletListItemInfoMap maBulletListItemMap;
sal_Bool mbIsListLevelStyleImage;
sal_Bool mbLineBreak;
sal_Bool mbIsURLField;
bool mbIsListLevelStyleImage;
bool mbLineBreak;
bool mbIsURLField;
OUString msUrl;
OUString msHyperlinkIdList;
sal_Bool mbIsPlacehlolderShape;
sal_Bool mbIWS;
bool mbIsPlacehlolderShape;
bool mbIWS;
Font maCurrentFont;
Font maParentFont;
@@ -226,18 +226,18 @@ class SVGTextWriter
sal_Int32 setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nCurAction );
void setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAction );
void addFontAttributes( sal_Bool bIsTextContainer );
void addFontAttributes( bool bIsTextContainer );
sal_Bool createParagraphEnumeration();
sal_Bool nextParagraph();
sal_Bool nextTextPortion();
bool createParagraphEnumeration();
bool nextParagraph();
bool nextTextPortion();
sal_Bool isTextShapeStarted() { return mbIsTextShapeStarted; }
bool isTextShapeStarted() { return mbIsTextShapeStarted; }
void startTextShape();
void endTextShape();
void startTextParagraph();
void endTextParagraph();
void startTextPosition( sal_Bool bExportX = sal_True, sal_Bool bExportY = sal_True);
void startTextPosition( bool bExportX = true, bool bExportY = true);
void endTextPosition();
void implExportHyperlinkIds();
void implWriteBulletChars();
@@ -245,9 +245,9 @@ class SVGTextWriter
void writeBitmapPlaceholder( const MetaBitmapActionType* pAction );
void implWriteEmbeddedBitmaps();
void writeTextPortion( const Point& rPos, const OUString& rText,
sal_Bool bApplyMapping = sal_True );
bool bApplyMapping = true );
void implWriteTextPortion( const Point& rPos, const OUString& rText,
Color aTextColor, sal_Bool bApplyMapping );
Color aTextColor, bool bApplyMapping );
void setVirtualDevice( VirtualDevice* pVDev, MapMode& rTargetMapMode )
{
@@ -275,7 +275,7 @@ class SVGTextWriter
}
void setPlaceholderShapeFlag( sal_Bool bState )
void setPlaceholderShapeFlag( bool bState )
{
mbIsPlacehlolderShape = bState;
}
@@ -287,9 +287,9 @@ class SVGTextWriter
void implSetFontFamily();
template< typename SubType >
sal_Bool implGetTextPosition( const MetaAction* pAction, Point& raPos, sal_Bool& bEmpty );
bool implGetTextPosition( const MetaAction* pAction, Point& raPos, bool& bEmpty );
template< typename SubType >
sal_Bool implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty );
bool implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, bool& rbEmpty );
void implRegisterInterface( const Reference< XInterface >& rxIf );
const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf );
@@ -317,11 +317,11 @@ private:
VirtualDevice* mpVDev;
MapMode maTargetMapMode;
sal_uInt32 mnInnerMtfCount;
sal_Bool mbDestroyVDev;
sal_Bool mbPaintAttrChanged;
sal_Bool mbFontAttrChanged;
sal_Bool mbClipAttrChanged;
sal_Bool mbIsPlacehlolderShape;
bool mbDestroyVDev;
bool mbPaintAttrChanged;
bool mbFontAttrChanged;
bool mbClipAttrChanged;
bool mbIsPlacehlolderShape;
SVGAttributeWriter* ImplAcquireContext()
@@ -349,27 +349,27 @@ private:
PolyPolygon& ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon& rDstPolyPoly ) const;
void ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL,
sal_Bool bApplyMapping = sal_True );
bool bApplyMapping = true );
void ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0,
sal_Bool bApplyMapping = sal_True );
bool bApplyMapping = true );
void ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY,
sal_Bool bApplyMapping = sal_True );
bool bApplyMapping = true );
void ImplWritePattern( const PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
void ImplAddLineAttr( const LineInfo &rAttrs,
sal_Bool bApplyMapping = sal_True );
void ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bLineOnly,
sal_Bool bApplyMapping = sal_True );
void ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool bApplyMapping = sal_True );
bool bApplyMapping = true );
void ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, bool bLineOnly,
bool bApplyMapping = true );
void ImplWriteShape( const SVGShapeDescriptor& rShape, bool bApplyMapping = true );
void ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient, sal_uInt32 nWriteFlags);
void ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, const Gradient& rGradient );
void ImplWriteGradientStop( const Color& rColor, double fOffset );
Color ImplGetColorWithIntensity( const Color& rColor, sal_uInt16 nIntensity );
Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
void ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags );
void ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, sal_Bool bApplyMapping = sal_True );
void ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, sal_Bool bApplyMapping );
void ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, bool bApplyMapping = true );
void ImplWriteText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping );
void ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz,
sal_Bool bApplyMapping = sal_True );
bool bApplyMapping = true );
void ImplCheckFontAttributes();
void ImplCheckPaintAttributes();
@@ -384,7 +384,7 @@ private:
public:
static OUString GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine );
static OUString GetPathString( const PolyPolygon& rPolyPoly, bool bLine );
static sal_uLong GetChecksum( const MetaAction* pAction );
public:
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 5acdfc0..1122d5a 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -238,7 +238,7 @@ void T602ImportFilter::inschr(unsigned char ch)
inschrdef(ch);
}
sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (RuntimeException)
{
Reset602();
@@ -254,7 +254,7 @@ sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star
if ( !mxInputStream.is() )
{
OSL_ASSERT( false );
return sal_False;
return false;
}
// An XML import service: what we push sax messages to..
@@ -445,7 +445,7 @@ sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star
mxHandler->endDocument();
return sal_True;
return true;
}
void T602ImportFilter::Reset602()
@@ -906,7 +906,7 @@ Locale SAL_CALL T602ImportFilterDialog::getLocale()
return meLocale;
}
sal_Bool T602ImportFilterDialog::OptionsDlg()
bool T602ImportFilterDialog::OptionsDlg()
{
Any any;
#define _propInt(_prop,_nam,_val) \
@@ -916,7 +916,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg()
any <<= (sal_Int16)_val;\
_prop->setPropertyValue(OUString::createFromAscii(_nam), any);
#define _propBool(_prop,_nam,_val) \
any <<= (sal_Bool)_val;\
any <<= _val;\
_prop->setPropertyValue(OUString::createFromAscii(_nam), any);
#define _propString(_prop,_nam,_val) \
any <<= OUString::createFromAscii(_val);\
@@ -1066,7 +1066,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg()
dialog->setVisible( false );
dialog->createPeer( xToolkit, NULL );
sal_Bool ret = ( dialog->execute() != 0 );
bool ret = ( dialog->execute() != 0 );
if ( ret ) {
sal_Int16 tt = 0;
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 13b11a6..ced0df9 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -99,7 +99,7 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 <
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
com::sun::star::lang::Locale meLocale;
ResMgr *mpResMgr;
sal_Bool OptionsDlg();
bool OptionsDlg();
ResMgr* getResMgr();
OUString getResStr( sal_Int16 resid );
void initLocale();
@@ -250,7 +250,7 @@ private:
void setfnt(fonts fnt,bool mustwrite);
void wrtfnt();
sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (::com::sun::star::uno::RuntimeException);
public:
@@ -288,7 +288,7 @@ private:
OUString T602ImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName )
bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( )
@@ -301,7 +301,7 @@ SAL_CALL T602ImportFilter_createInstance( const ::com::sun::star::uno::Reference
OUString T602ImportFilterDialog_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName )
bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( )
diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx
index c0371ba..670be2d 100644
--- a/filter/source/textfilterdetect/filterdetect.hxx
+++ b/filter/source/textfilterdetect/filterdetect.hxx
@@ -63,7 +63,7 @@ public:
OUString PlainTextFilterDetect_getImplementationName();
sal_Bool PlainTextFilterDetect_supportsService(const OUString& ServiceName);
bool PlainTextFilterDetect_supportsService(const OUString& ServiceName);
com::sun::star::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames();
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index fdfe30d..ced9df1 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -64,7 +64,7 @@ using namespace com::sun::star::xml::sax;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::task;
sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (RuntimeException)
{
OUString udConvertClass=msUserData[0];
@@ -110,7 +110,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
Reference < XDocumentHandler > xHandler( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( sXMLImportService, aAnys, mxContext ), UNO_QUERY );
if(! xHandler.is()) {
OSL_FAIL("XMLReader::Read: %s Unable to create service instance xHandler\n" );
return sal_False;
return false;
}
Reference < XImporter > xImporter( xHandler, UNO_QUERY );
xImporter->setTargetDocument ( mxDoc );
@@ -125,7 +125,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
Reference< XInterface > xConvBridge(mxContext->getServiceManager()->createInstanceWithContext(udConvertClass, mxContext), UNO_QUERY);
if(! xConvBridge.is()){
OSL_FAIL( "XMLReader::Read: %s service missing\n" );
return sal_False;
return false;
}
if (xStatusIndicator.is())
xStatusIndicator->setValue(nSteps++);
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
if (!xConverter->importer(aDescriptor,xHandler,msUserData)) {
if (xStatusIndicator.is())
xStatusIndicator->end();
return sal_False;
return false;
}
}
#if OSL_DEBUG_LEVEL > 0
@@ -179,16 +179,16 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
xStatusIndicator->end();
OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
return sal_False;
return false;
}
if (xStatusIndicator.is()) {
xStatusIndicator->setValue(nSteps++);
xStatusIndicator->end();
}
return sal_True;
return true;
}
sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (RuntimeException)
{
@@ -209,7 +209,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
Reference< com::sun::star::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY);
if(! xConverter.is()){
OSL_FAIL( "xml export sub service missing" );
return sal_False;
return false;
}
if (xStatusIndicator.is())
@@ -219,7 +219,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
if (!xConverter->exporter(aDescriptor, msUserData)) {
if (xStatusIndicator.is())
xStatusIndicator->end();
return sal_False;
return false;
}
if (xStatusIndicator.is())
xStatusIndicator->setValue(nSteps++);
@@ -232,12 +232,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
// pretty printing is confusing for some filters so it is disabled by default
sal_Bool bPrettyPrint =
bool bPrettyPrint =
(msUserData.getLength() > 6 && msUserData[6].equalsIgnoreAsciiCase("true"));
// export of <text:number> element for <text:list-item> elements are
// needed for certain filters.
sal_Bool bExportTextNumberElementForListItems =
bool bExportTextNumberElementForListItems =
( msUserData.getLength() > 7 &&
msUserData[7].equalsIgnoreAsciiCase("true") );
@@ -288,7 +288,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
{
if (xStatusIndicator.is())
xStatusIndicator->end();
return sal_False;
return false;
}
}
#if OSL_DEBUG_LEVEL > 0
@@ -300,13 +300,13 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr());
if (xStatusIndicator.is())
xStatusIndicator->end();
return sal_False;
return false;
}
// done
if (xStatusIndicator.is())
xStatusIndicator->end();
return sal_True;
return true;
}
sal_Bool SAL_CALL XmlFilterAdaptor::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index 89250ab..f628dfd 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -65,10 +65,10 @@ protected:
FilterType meType;
sal_Bool SAL_CALL exportImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
bool SAL_CALL exportImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (::com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (::com::sun::star::uno::RuntimeException);
@@ -137,19 +137,16 @@ public:
OUString XmlFilterAdaptor_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName )
bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index 3b8825f..72c0fe5 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -58,10 +58,10 @@ protected:
css::uno::Sequence< OUString > msUserData;
sal_Bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
throw (css::uno::RuntimeException);
sal_Bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
throw (css::uno::RuntimeException);
public:
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index 14e2de7..59523ce 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -65,9 +65,9 @@ public:
sal_Int32 maFileFormatVersion;
sal_Int32 mnDocumentIconID;
sal_Bool mbReadonly;
bool mbReadonly;
sal_Bool mbNeedsXSLT2;
bool mbNeedsXSLT2;
filter_info_impl();
filter_info_impl( const filter_info_impl& rInfo );
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 63f247a..1b56bbd 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -86,7 +86,7 @@ static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder,
throw lang::IllegalArgumentException();
Sequence< Any > aArgs(1);
aArgs[0] <<= (sal_Bool)sal_True;
aArgs[0] <<= true;
Reference< XInterface > xFolder( xFactory->createInstanceWithArguments(aArgs) );
Reference< XNamed > xNamed( xFolder, UNO_QUERY );
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 4b05bbe..8d85688 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -189,7 +189,7 @@ void XMLFilterSettingsDialog::updateStates()
if(pSelectedEntry)
{
filter_info_impl* pInfo = (filter_info_impl*)pSelectedEntry->GetUserData();
bIsReadonly = 0 != pInfo->mbReadonly;
bIsReadonly = pInfo->mbReadonly;
sal_Int32 nFact = SvtModuleOptions::E_WRITER;
while(nFact <= SvtModuleOptions::E_BASIC)
@@ -1013,7 +1013,7 @@ bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
KeyCode aKeyCode = pKEvt->GetKeyCode();
sal_uInt16 nKeyCode = aKeyCode.GetCode();
sal_Bool bMod1 = pKEvt->GetKeyCode().IsMod1();
bool bMod1 = pKEvt->GetKeyCode().IsMod1();
if( nKeyCode == KEY_ESCAPE || (bMod1 && (nKeyCode == KEY_W)))
{
@@ -1187,7 +1187,7 @@ void XMLFilterSettingsDialog::initFilterList()
else if ( pValues2->Name == "Finalized" )
{
// both the filter and the type may be finalized
sal_Bool bTemp = sal_False;
bool bTemp = false;
pValues2->Value >>= bTemp;
pTempFilter->mbReadonly |= bTemp;
}
@@ -1543,8 +1543,8 @@ filter_info_impl::filter_info_impl()
: maFlags(0x00080040),
maFileFormatVersion(0),
mnDocumentIconID(0),
mbReadonly(sal_False),
mbNeedsXSLT2(sal_False)
mbReadonly(false),
mbNeedsXSLT2(false)
{
}
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index ab4b765..649c32f 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -450,7 +450,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
aSourceData[i++].Value <<= xIS;
aSourceData[i].Name = "Indent";
aSourceData[i++].Value <<= (sal_Bool)sal_True;
aSourceData[i++].Value <<= true;
if( bUseDocType )
{
@@ -614,7 +614,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
aSourceData[i++].Value <<= rURL;
aSourceData[i ].Name = "Indent";
aSourceData[i++].Value <<= (sal_Bool)sal_True;
aSourceData[i++].Value <<= true;
Reference< XWriter > xWriter = Writer::create( mxContext );
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index a0761f8..26cb3a0 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -114,8 +114,8 @@ namespace XSLT
css::uno::Reference<xslt::XXSLTTransformer> m_tcontrol;
oslCondition m_cTransformed;
sal_Bool m_bTerminated;
sal_Bool m_bError;
bool m_bTerminated;
bool m_bError;
OUString m_aExportBaseUrl;
@@ -164,7 +164,7 @@ namespace XSLT
};
XSLTFilter::XSLTFilter(const css::uno::Reference<XComponentContext> &r):
m_xContext(r), m_bTerminated(sal_False), m_bError(sal_False)
m_xContext(r), m_bTerminated(false), m_bError(false)
{
m_cTransformed = osl_createCondition();
}
@@ -246,7 +246,7 @@ namespace XSLT
{
SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << e.Message);
}
m_bError = sal_True;
m_bError = true;
osl_setCondition(m_cTransformed);
}
void
@@ -257,7 +257,7 @@ namespace XSLT
void
XSLTFilter::terminated() throw (RuntimeException, std::exception)
{
m_bTerminated = sal_True;
m_bTerminated = true;
osl_setCondition(m_cTransformed);
}
@@ -389,7 +389,7 @@ namespace XSLT
pRequest->addContinuation(pAbort);
xInterActionHandler->handle(xRequest);
if (pAbort->wasSelected()) {
m_bError = sal_True;
m_bError = true;
osl_setCondition(m_cTransformed);
}
}
@@ -433,7 +433,7 @@ namespace XSLT
// since that is where our xml-writer will push the data
// from it's data-source interface
OUString aName, sURL;
sal_Bool bIndent = sal_False;
bool bIndent = false;
OUString aDoctypePublic;
// css::uno::Reference<XOutputStream> rOutputStream;
sal_Int32 nLength = aSourceData.getLength();
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index c4b49cb..866e1b2 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -428,7 +428,7 @@ void OWriteStream_Impl::SetDecrypted()
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
if ( m_aProps[nInd].Name == "Encrypted" )
m_aProps[nInd].Value <<= sal_False;
m_aProps[nInd].Value <<= false;
}
}
@@ -451,7 +451,7 @@ void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEn
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
if ( m_aProps[nInd].Name == "Encrypted" )
m_aProps[nInd].Value <<= sal_True;
m_aProps[nInd].Value <<= true;
}
m_bUseCommonEncryption = false; // very important to set it to false
@@ -773,7 +773,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
// set to be encrypted but do not use encryption key
xPropertySet->setPropertyValue( STORAGE_ENCRYPTION_KEYS_PROPERTY,
uno::makeAny( uno::Sequence< beans::NamedValue >() ) );
xPropertySet->setPropertyValue( "Encrypted", uno::makeAny( sal_True ) );
xPropertySet->setPropertyValue( "Encrypted", uno::makeAny( true ) );
}
// the stream should be free soon, after package is stored
@@ -871,7 +871,7 @@ void OWriteStream_Impl::Commit()
xPropertySet->setPropertyValue( STORAGE_ENCRYPTION_KEYS_PROPERTY,
uno::makeAny( uno::Sequence< beans::NamedValue >() ) );
xPropertySet->setPropertyValue( "Encrypted",
uno::makeAny( sal_True ) );
uno::makeAny( true ) );
}
else if ( m_bHasCachedEncryptionData )
{
