[Libreoffice-commits] core.git: 6 commits - desktop/source dtrans/source embeddedobj/source eventattacher/source filter/source package/inc package/source
Noel Grandin
noel at peralex.com
Tue Apr 22 00:56:51 PDT 2014
desktop/source/deployment/gui/license_dialog.cxx | 16
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 2
desktop/source/deployment/inc/lockfile.hxx | 8
desktop/source/deployment/manager/dp_extensionmanager.cxx | 4
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 2
desktop/source/deployment/misc/lockfile.cxx | 26 -
desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 2
desktop/source/deployment/registry/package/dp_package.cxx | 8
dtrans/source/cnttype/mcnttype.cxx | 8
dtrans/source/cnttype/mcnttype.hxx | 2
embeddedobj/source/commonembedding/embedobj.cxx | 18
embeddedobj/source/commonembedding/inplaceobj.cxx | 2
embeddedobj/source/commonembedding/miscobj.cxx | 50 +-
embeddedobj/source/commonembedding/persistence.cxx | 68 +-
embeddedobj/source/commonembedding/visobj.cxx | 14
embeddedobj/source/general/docholder.cxx | 102 ++--
embeddedobj/source/general/dummyobject.cxx | 8
embeddedobj/source/inc/commonembobj.hxx | 22
embeddedobj/source/inc/docholder.hxx | 30 -
embeddedobj/source/inc/dummyobject.hxx | 12
embeddedobj/source/inc/oleembobj.hxx | 52 +-
embeddedobj/source/msole/oleembed.cxx | 16
embeddedobj/source/msole/olemisc.cxx | 54 +-
embeddedobj/source/msole/olepersist.cxx | 78 +--
embeddedobj/source/msole/olevisual.cxx | 4
embeddedobj/source/msole/ownview.cxx | 64 +-
embeddedobj/source/msole/ownview.hxx | 12
embeddedobj/source/msole/xolefactory.cxx | 6
eventattacher/source/eventattacher.cxx | 6
filter/source/config/cache/basecontainer.cxx | 8
filter/source/config/cache/cacheitem.cxx | 46 -
filter/source/config/cache/cacheitem.hxx | 6
filter/source/config/cache/cacheupdatelistener.cxx | 4
filter/source/config/cache/filtercache.cxx | 52 +-
filter/source/config/cache/filtercache.hxx | 12
filter/source/config/cache/filterfactory.cxx | 8
filter/source/config/cache/querytokenizer.cxx | 8
filter/source/config/cache/querytokenizer.hxx | 4
filter/source/config/cache/typedetection.cxx | 20
filter/source/config/cache/typedetection.hxx | 6
filter/source/flash/swfexporter.cxx | 40 -
filter/source/flash/swfexporter.hxx | 26 -
filter/source/flash/swffilter.cxx | 22
filter/source/flash/swfwriter.cxx | 2
filter/source/flash/swfwriter.hxx | 12
filter/source/flash/swfwriter1.cxx | 40 -
filter/source/graphicfilter/egif/egif.cxx | 54 +-
filter/source/graphicfilter/eos2met/eos2met.cxx | 80 +--
filter/source/graphicfilter/epbm/epbm.cxx | 16
filter/source/graphicfilter/epgm/epgm.cxx | 16
filter/source/graphicfilter/epict/epict.cxx | 150 +++---
filter/source/graphicfilter/eppm/eppm.cxx | 14
filter/source/graphicfilter/eps/eps.cxx | 134 ++---
filter/source/graphicfilter/eras/eras.cxx | 18
filter/source/graphicfilter/etiff/etiff.cxx | 22
filter/source/graphicfilter/expm/expm.cxx | 22
filter/source/graphicfilter/icgm/actimpr.cxx | 20
filter/source/graphicfilter/icgm/bitmap.cxx | 24
filter/source/graphicfilter/icgm/bitmap.hxx | 14
filter/source/graphicfilter/icgm/cgm.cxx | 24
filter/source/graphicfilter/icgm/cgm.hxx | 30 -
filter/source/graphicfilter/icgm/chart.cxx | 2
filter/source/graphicfilter/icgm/chart.hxx | 2
filter/source/graphicfilter/icgm/class0.cxx | 28 -
filter/source/graphicfilter/icgm/class1.cxx | 26 -
filter/source/graphicfilter/icgm/class2.cxx | 20
filter/source/graphicfilter/icgm/class3.cxx | 18
filter/source/graphicfilter/icgm/class4.cxx | 52 +-
filter/source/graphicfilter/icgm/class5.cxx | 14
filter/source/graphicfilter/icgm/classx.cxx | 4
filter/source/graphicfilter/icgm/elements.cxx | 2
filter/source/graphicfilter/icgm/elements.hxx | 2
filter/source/graphicfilter/icgm/outact.cxx | 2
filter/source/graphicfilter/icgm/outact.hxx | 8
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 44 -
filter/source/graphicfilter/idxf/dxf2mtf.hxx | 10
filter/source/graphicfilter/idxf/dxfentrd.cxx | 46 -
filter/source/graphicfilter/idxf/dxfentrd.hxx | 16
filter/source/graphicfilter/idxf/dxfgrprd.cxx | 16
filter/source/graphicfilter/idxf/dxfgrprd.hxx | 8
filter/source/graphicfilter/idxf/dxfreprd.cxx | 14
filter/source/graphicfilter/idxf/dxfreprd.hxx | 6
filter/source/graphicfilter/idxf/dxfvec.cxx | 14
filter/source/graphicfilter/idxf/dxfvec.hxx | 20
filter/source/graphicfilter/idxf/idxf.cxx | 4
filter/source/graphicfilter/ieps/ieps.cxx | 32 -
filter/source/graphicfilter/ios2met/ios2met.cxx | 190 +++----
filter/source/graphicfilter/ipbm/ipbm.cxx | 128 ++---
filter/source/graphicfilter/ipcd/ipcd.cxx | 24
filter/source/graphicfilter/ipcx/ipcx.cxx | 38 -
filter/source/graphicfilter/ipict/ipict.cxx | 42 -
filter/source/graphicfilter/ipsd/ipsd.cxx | 80 +--
filter/source/graphicfilter/iras/iras.cxx | 46 -
filter/source/graphicfilter/itga/itga.cxx | 124 ++---
filter/source/graphicfilter/itiff/ccidecom.cxx | 72 +-
filter/source/graphicfilter/itiff/ccidecom.hxx | 12
filter/source/graphicfilter/itiff/itiff.cxx | 94 +--
filter/source/graphicfilter/itiff/lzwdecom.cxx | 12
filter/source/graphicfilter/itiff/lzwdecom.hxx | 2
filter/source/msfilter/escherex.cxx | 110 ++--
filter/source/msfilter/eschesdo.cxx | 46 -
filter/source/msfilter/eschesdo.hxx | 36 -
filter/source/msfilter/msdffimp.cxx | 152 +++---
filter/source/msfilter/msoleexp.cxx | 8
filter/source/msfilter/svdfppt.cxx | 92 +--
filter/source/pdf/impdialog.cxx | 94 +--
filter/source/pdf/impdialog.hxx | 84 +--
filter/source/pdf/pdfexport.cxx | 100 ++--
filter/source/pdf/pdfexport.hxx | 68 +-
filter/source/pdf/pdffilter.cxx | 6
filter/source/pdf/pdffilter.hxx | 4
filter/source/pdf/pdfinteract.cxx | 4
filter/source/pdf/pdfinteract.hxx | 2
filter/source/placeware/exporter.cxx | 18
filter/source/placeware/exporter.hxx | 2
filter/source/svg/impsvgdialog.cxx | 2
filter/source/svg/impsvgdialog.hxx | 2
filter/source/svg/svgdialog.hxx | 2
filter/source/svg/svgexport.cxx | 162 +++---
filter/source/svg/svgfilter.cxx | 12
filter/source/svg/svgfilter.hxx | 84 +--
filter/source/svg/svgfontexport.cxx | 4
filter/source/svg/svgimport.cxx | 10
filter/source/svg/svgreader.cxx | 4
filter/source/svg/svgreader.hxx | 2
filter/source/svg/svgwriter.cxx | 202 ++++----
filter/source/svg/svgwriter.hxx | 70 +-
filter/source/t602/t602filter.cxx | 12
filter/source/t602/t602filter.hxx | 8
filter/source/textfilterdetect/filterdetect.hxx | 2
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 28 -
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 9
filter/source/xmlfilterdetect/filterdetect.hxx | 4
filter/source/xsltdialog/xmlfiltercommon.hxx | 4
filter/source/xsltdialog/xmlfilterjar.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 10
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 4
filter/source/xsltfilter/XSLTFilter.cxx | 14
package/inc/HashMaps.hxx | 2
package/inc/ZipEnumeration.hxx | 2
package/inc/ZipFile.hxx | 34 -
package/inc/ZipOutputStream.hxx | 4
package/inc/ZipPackage.hxx | 16
package/inc/ZipPackageBuffer.hxx | 2
package/inc/ZipPackageEntry.hxx | 2
package/inc/ZipPackageFolder.hxx | 8
package/inc/ZipPackageStream.hxx | 36 -
package/inc/mutexholder.hxx | 2
package/inc/zipfileaccess.hxx | 4
package/source/manifest/ManifestExport.cxx | 12
package/source/manifest/ManifestImport.cxx | 12
package/source/manifest/ManifestImport.hxx | 2
package/source/xstor/ocompinstream.cxx | 8
package/source/xstor/ocompinstream.hxx | 2
package/source/xstor/ohierarchyholder.cxx | 4
package/source/xstor/ohierarchyholder.hxx | 2
package/source/xstor/owriteablestream.cxx | 174 +++----
package/source/xstor/owriteablestream.hxx | 62 +-
package/source/xstor/switchpersistencestream.cxx | 38 -
package/source/xstor/xfactory.cxx | 4
package/source/xstor/xstorage.cxx | 246 +++++-----
package/source/xstor/xstorage.hxx | 44 -
package/source/zipapi/XUnbufferedStream.cxx | 18
package/source/zipapi/XUnbufferedStream.hxx | 8
package/source/zipapi/ZipEnumeration.cxx | 2
package/source/zipapi/ZipFile.cxx | 50 +-
package/source/zipapi/ZipOutputStream.cxx | 12
package/source/zippackage/ZipPackage.cxx | 80 +--
package/source/zippackage/ZipPackageBuffer.cxx | 6
package/source/zippackage/ZipPackageEntry.cxx | 8
package/source/zippackage/ZipPackageFolder.cxx | 40 -
package/source/zippackage/ZipPackageStream.cxx | 80 +--
package/source/zippackage/zipfileaccess.cxx | 26 -
175 files changed, 2728 insertions(+), 2731 deletions(-)
New commits:
commit d83dfeb5e59c8f3de12d673b001a44001f644e7d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 17 15:47:00 2014 +0200
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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list