summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:57:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:17 +0100
commit0d957046f103605ba51b2a59a8f4c463ca33010a (patch)
tree66acd5576bd19167c14837d8b036673485f252bc /svx/source/items
parentbd9581d46d78c5742fbb50f1b4a9ff2fc1dae7e8 (diff)
bool improvements
Change-Id: Ic32faa81bfbb66a9d8632fb3db187e33c31188ed
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/algitem.cxx4
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/hlnkitem.cxx12
-rw-r--r--svx/source/items/pageitem.cxx4
4 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 6dede3649173..85331e6b10c5 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -112,7 +112,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
- return sal_False;
+ return false;
eOrient = (table::CellOrientation)nValue;
}
SvxCellOrientation eSvx = SVX_ORIENTATION_STANDARD;
@@ -368,7 +368,7 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
sal_Int32 nVal = 0;
if(!(rVal >>= nVal) || (nVal > nMaxVal))
- return sal_False;
+ return false;
switch ( nMemberId & ~CONVERT_TWIPS )
{
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index fe978749b5c2..39a856008fb3 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -96,7 +96,7 @@ bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
{
const SvxClipboardFmtItem& rCmp = (SvxClipboardFmtItem&)rComp;
if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size())
- return 0;
+ return false;
int nRet = 1;
for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.size(); n < nEnd; ++n )
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 5af2eb821526..367b1141e102 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -242,7 +242,7 @@ bool SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
sIntName == rItem.sIntName &&
nMacroEvents == rItem.nMacroEvents);
if (!bRet)
- return sal_False;
+ return false;
const SvxMacroTableDtor* pOther = ((SvxHyperlinkItem&)rAttr).pMacroTable;
if( !pMacroTable )
@@ -324,27 +324,27 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
{
case MID_HLINK_NAME :
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sIntName = aStr;
break;
case MID_HLINK_TEXT :
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sName = aStr;
break;
case MID_HLINK_URL:
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sURL = aStr.getStr();
break;
case MID_HLINK_TARGET:
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sTarget = aStr;
break;
case MID_HLINK_TYPE:
if(!(rVal >>= nVal))
- return sal_False;
+ return false;
eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
break;
default:
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index cdebc8ae20b4..2ace029f5a37 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -183,7 +183,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
case SVX_PAGE_MIRROR: eRet = style::PageStyleLayout_MIRRORED; break;
default:
OSL_FAIL("was fuer ein Layout ist das?");
- return sal_False;
+ return false;
}
rVal <<= eRet;
}
@@ -216,7 +216,7 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
- return sal_False;
+ return false;
eLayout = (style::PageStyleLayout)nValue;
}
eUse &= 0xfff0;