summaryrefslogtreecommitdiff
path: root/toolkit/source/helper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-24 11:13:09 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-24 11:13:42 +0100
commit146c7c5c89d9ce26c3de951ff049d36df1b5857b (patch)
treed66d72cb77002c96f528790f88012617243ccbf3 /toolkit/source/helper
parent569756aaf4606313297eace88b3ad5a6f57d8329 (diff)
toolkit: sal_Bool -> bool
Change-Id: I5153c4413004d1b50cc503b3e70657bc831a5793
Diffstat (limited to 'toolkit/source/helper')
-rw-r--r--toolkit/source/helper/formpdfexport.cxx2
-rw-r--r--toolkit/source/helper/property.cxx18
-rw-r--r--toolkit/source/helper/unopropertyarrayhelper.cxx4
-rw-r--r--toolkit/source/helper/unowrapper.cxx2
-rw-r--r--toolkit/source/helper/vclunohelper.cxx2
5 files changed, 14 insertions, 14 deletions
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 4a4fdf813158..c66d1489cd43 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -354,7 +354,7 @@ namespace toolkitform
static const OUString FM_PROP_MULTILINE("MultiLine");
if ( xPSI->hasPropertyByName( FM_PROP_MULTILINE ) )
{
- sal_Bool bMultiLine = sal_False;
+ bool bMultiLine = false;
OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_MULTILINE ) >>= bMultiLine );
if ( bMultiLine )
_rpDescriptor->TextStyle |= TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK;
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 5d3934adfb6e..408b27800b86 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -65,17 +65,17 @@ struct ImplPropertyInfo
sal_uInt16 nPropId;
::com::sun::star::uno::Type aType;
sal_Int16 nAttribs;
- sal_Bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
+ bool bDependsOnOthers; // eg. VALUE depends on MIN/MAX and must be set after MIN/MAX.
ImplPropertyInfo()
{
nPropId = 0;
nAttribs = 0;
- bDependsOnOthers = sal_False;
+ bDependsOnOthers = false;
}
ImplPropertyInfo( OUString const & theName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
- sal_Int16 nAttrs, sal_Bool bDepends = sal_False )
+ sal_Int16 nAttrs, bool bDepends = false )
: aName( theName )
{
nPropId = nId;
@@ -94,9 +94,9 @@ struct ImplPropertyInfo
ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 )
#define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, sal_True )
+ ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true )
#define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, sal_True )
+ ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true )
ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
{
@@ -319,13 +319,13 @@ struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,
void ImplAssertValidPropertyArray()
{
- static sal_Bool bSorted = sal_False;
+ static bool bSorted = false;
if( !bSorted )
{
sal_uInt16 nElements;
ImplPropertyInfo* pInfos = ImplGetPropertyInfos( nElements );
::std::sort(pInfos, pInfos+nElements,ImplPropertyInfoCompareFunctor());
- bSorted = sal_True;
+ bSorted = true;
}
}
@@ -392,14 +392,14 @@ sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId )
return pImplPropertyInfo ? pImplPropertyInfo->nAttribs : 0;
}
-sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId )
+bool DoesDependOnOthers( sal_uInt16 nPropertyId )
{
const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId );
DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" );
return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : sal_False;
}
-sal_Bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 )
+bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 )
{
return ::comphelper::compare( r1, r2 );
}
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index ccad3c9a7a88..9886e61b5a8c 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -41,7 +41,7 @@ UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::list< sal_uInt16 > &r
maIDs.insert( *iter );
}
-sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
+bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
{
if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
nPropId = BASEPROPERTY_FONTDESCRIPTOR;
@@ -53,7 +53,7 @@ sal_Bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nPropId )
{
sal_uInt16 id = sal::static_int_cast< sal_uInt16 >(nPropId);
- sal_Bool bValid = ImplHasProperty( id );
+ bool bValid = ImplHasProperty( id );
if ( bValid )
{
if ( pPropName )
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 290502e0f0b5..7f0cdcf5d2c4 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -205,7 +205,7 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
}
-static sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
+static bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
{
Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;
while ( pWindow && ( pWindow != pParentWindow ) )
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 6b1090225aa5..9b10be493488 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -385,7 +385,7 @@ Font VCLUnoHelper::CreateFont( const ::com::sun::star::uno::Reference< ::com::su
return aFM;
}
-sal_Bool VCLUnoHelper::IsZero( ::com::sun::star::awt::Rectangle rRect )
+bool VCLUnoHelper::IsZero( ::com::sun::star::awt::Rectangle rRect )
{
return ( !rRect.X && !rRect.Y && !rRect.Width && !rRect.Height );
}