summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-04 16:29:49 +0200
committerNoel Grandin <noel@peralex.com>2014-04-07 13:53:50 +0200
commit62a4722a0d23ce9adf4db0a6e8c24b878f91062a (patch)
tree69d2cbf94125dc2ec6d395f570d37e9345b7af72
parent6ed14fd8f8eb8e844434a982dd73df0a71a83afc (diff)
xmlscript: sal_Bool->bool
Change-Id: Ib784d23aa613dce80b786ecadb98cc2c3c278e33
-rw-r--r--xmlscript/source/xmldlg_imexp/exp_share.hxx4
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx2
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_export.cxx4
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.cxx10
4 files changed, 10 insertions, 10 deletions
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 5a42ad3abdc1..93be668a1a27 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -163,7 +163,7 @@ public:
void readDataAwareAttr(
OUString const & rAttrName );
inline void addBoolAttr(
- OUString const & rAttrName, sal_Bool bValue )
+ OUString const & rAttrName, bool bValue )
{ addAttribute( rAttrName, OUString::boolean(bValue) ); }
void addNumberFormatAttr(
css::uno::Reference< css::beans::XPropertySet >
@@ -254,7 +254,7 @@ inline void ElementDescriptor::read<sal_Bool>(
_xPropState->getPropertyState( propName ))
{
css::uno::Any a( _xProps->getPropertyValue( propName ) );
- sal_Bool v = sal_Bool();
+ bool v;
if (a >>= v)
addAttribute( attrName, OUString::boolean(v) );
else
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 74022042290c..560da0f9ace2 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -255,7 +255,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" );
readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
- sal_Bool bTriState = sal_False;
+ bool bTriState = false;
if ((readProp( "TriState" ) >>= bTriState) && bTriState)
{
addAttribute( XMLNS_DIALOGS_PREFIX ":tristate", "true" );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 5eef0f3465e3..d64ba5a06edf 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -1037,7 +1037,7 @@ void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible
addAttribute( XMLNS_DIALOGS_PREFIX ":id", * reinterpret_cast< const OUString * >( a.getValue() ) );
readShortAttr( "TabIndex", XMLNS_DIALOGS_PREFIX ":tab-index" );
- sal_Bool bEnabled = sal_False;
+ bool bEnabled = false;
if (_xProps->getPropertyValue( "Enabled" ) >>= bEnabled)
{
if (! bEnabled)
@@ -1050,7 +1050,7 @@ void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible
SAL_WARN( "xmlscript.xmldlg", "unexpected property type for \"Enabled\": not bool!" );
}
- sal_Bool bVisible = sal_True;
+ bool bVisible = true;
if (supportVisible) try
{
if (_xProps->getPropertyValue("EnableVisible" ) >>= bVisible)
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index ecce3c63c089..87a9b5583675 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -160,7 +160,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
{
::osl::MutexGuard aGuard( m_aMutex );
- sal_Bool bReturn = sal_True;
+ bool bReturn = true;
try
{
@@ -369,22 +369,22 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
catch ( const container::NoSuchElementException& e )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught NoSuchElementException reason " << e.Message );
- bReturn = sal_False;
+ bReturn = false;
}
catch ( const lang::IllegalArgumentException& e )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught IllegalArgumentException reason " << e.Message );
- bReturn = sal_False;
+ bReturn = false;
}
catch ( const lang::WrappedTargetException& e )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught WrappedTargetException reason " << e.Message );
- bReturn = sal_False;
+ bReturn = false;
}
catch ( const xml::sax::SAXException& e )
{
SAL_INFO("xmlscript.xmlflat", "XMLBasicExporterBase::filter: caught SAXException reason " << e.Message );
- bReturn = sal_False;
+ bReturn = false;
}
return bReturn;