summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-13 14:07:10 +0200
committerNoel Grandin <noel@peralex.com>2014-02-14 14:15:16 +0200
commit0950700bea414cacec8b81cd457adf7cdbdb8deb (patch)
tree0d6444cf5615a1ea7011430cb645894611cd51d1 /sc
parent8b34d05cb13d839d80aca696bf6ba766dd7e28cb (diff)
sal_Bool->bool
Change-Id: I49b58a10fc89868aa5406d62eec3f2bc7186611c
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx33
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx2
-rw-r--r--sc/source/ui/inc/AccessibleCell.hxx12
-rw-r--r--sc/source/ui/inc/AccessibleCellBase.hxx2
-rw-r--r--sc/source/ui/inc/AccessiblePreviewCell.hxx2
6 files changed, 29 insertions, 28 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 454503cdb59b..8691ac6d8174 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -320,17 +320,17 @@ uno::Sequence< OUString> SAL_CALL
//==== internal =========================================================
-sal_Bool ScAccessibleCell::IsDefunc(
+bool ScAccessibleCell::IsDefunc(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
return ScAccessibleContextBase::IsDefunc() || (mpDoc == NULL) || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
}
-sal_Bool ScAccessibleCell::IsEditable(
+bool ScAccessibleCell::IsEditable(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
- sal_Bool bEditable(sal_True);
+ bool bEditable(true);
if (rxParentStates.is() && !rxParentStates->contains(AccessibleStateType::EDITABLE) &&
mpDoc)
{
@@ -344,11 +344,11 @@ sal_Bool ScAccessibleCell::IsEditable(
return bEditable;
}
-sal_Bool ScAccessibleCell::IsOpaque(
+bool ScAccessibleCell::IsOpaque(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
// test whether there is a background color
- sal_Bool bOpaque(sal_True);
+ bool bOpaque(true);
if (mpDoc)
{
const SvxBrushItem* pItem = (const SvxBrushItem*)mpDoc->GetAttr(
@@ -360,7 +360,7 @@ sal_Bool ScAccessibleCell::IsOpaque(
return bOpaque;
}
-sal_Bool ScAccessibleCell::IsSelected()
+bool ScAccessibleCell::IsSelected()
{
if (IsFormulaMode())
{
@@ -369,10 +369,10 @@ sal_Bool ScAccessibleCell::IsSelected()
{
return pSheet->IsScAddrFormulaSel(maCellAddress);
}
- return sal_False;
+ return false;
}
- sal_Bool bResult(false);
+ bool bResult(false);
if (mpViewShell && mpViewShell->GetViewData())
{
const ScMarkData& rMarkdata = mpViewShell->GetViewData()->GetMarkData();
@@ -565,16 +565,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAtt
return aAttribs;
}
-sal_Bool ScAccessibleCell::IsFormulaMode()
+bool ScAccessibleCell::IsFormulaMode()
{
- ScAccessibleSpreadsheet* pSheet =static_cast<ScAccessibleSpreadsheet*>(mxParent.get());
+ ScAccessibleSpreadsheet* pSheet = static_cast<ScAccessibleSpreadsheet*>(mxParent.get());
if (pSheet)
{
return pSheet->IsFormulaMode();
}
- return sal_False;
+ return false;
}
-sal_Bool ScAccessibleCell::IsDropdown()
+
+bool ScAccessibleCell::IsDropdown()
{
sal_uInt16 nPosX = maCellAddress.Col();
sal_uInt16 nPosY = sal_uInt16(maCellAddress.Row());
@@ -584,13 +585,13 @@ sal_Bool ScAccessibleCell::IsDropdown()
{
const ScValidationData* pData = mpDoc->GetValidationEntry( nValidation );
if( pData && pData->HasSelectionList() )
- return sal_True;
+ return true;
}
ScMergeFlagAttr* pAttr;
pAttr = (ScMergeFlagAttr*)mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
if( pAttr->HasAutoFilter() )
{
- return sal_True;
+ return true;
}
else
{
@@ -619,11 +620,11 @@ sal_Bool ScAccessibleCell::IsDropdown()
{
bHasScenario = (aRange.aStart.Col() == nPosX && aRange.aStart.Row() == nPosY+1);
}
- if( bHasScenario ) return sal_True;
+ if( bHasScenario ) return true;
}
}
}
- return sal_False;
+ return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index ccabfbcbdf1d..b1a8ed8f13aa 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -311,12 +311,12 @@ uno::Sequence<sal_Int8> SAL_CALL
return theScAccessibleCellBaseImplementationId::get().getSeq();
}
-sal_Bool ScAccessibleCellBase::IsEditable(
+bool ScAccessibleCellBase::IsEditable(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
- sal_Bool bEditable(false);
+ bool bEditable(false);
if (rxParentStates.is() && rxParentStates->contains(AccessibleStateType::EDITABLE))
- bEditable = sal_True;
+ bEditable = true;
return bEditable;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index d2941347e079..921272cb0def 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -259,7 +259,7 @@ sal_Bool ScAccessiblePreviewCell::IsDefunc(
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
}
-sal_Bool ScAccessiblePreviewCell::IsEditable(
+bool ScAccessiblePreviewCell::IsEditable(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
return false;
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 9ad298b2f215..c8ef527b9d1e 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -159,16 +159,16 @@ private:
ScSplitPos meSplitPos;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- virtual sal_Bool IsEditable(
+ virtual bool IsEditable(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- sal_Bool IsOpaque(
+ bool IsOpaque(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- sal_Bool IsSelected();
+ bool IsSelected();
ScDocument* GetDocument(ScTabViewShell* mpViewShell);
@@ -182,8 +182,8 @@ private:
void AddRelation(const ScRange& rRange,
const sal_uInt16 aRelationType,
::utl::AccessibleRelationSetHelper* pRelationSet);
- sal_Bool IsFormulaMode();
- sal_Bool IsDropdown();
+ bool IsFormulaMode();
+ bool IsDropdown();
};
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 8bc9717d41a0..2b0d329b31a7 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -134,7 +134,7 @@ protected:
sal_Int32 mnIndex;
private:
- virtual sal_Bool IsEditable(
+ virtual bool IsEditable(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
protected:
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index daf187e5e045..a1a34186f07c 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -98,7 +98,7 @@ private:
sal_Bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- virtual sal_Bool IsEditable(
+ virtual bool IsEditable(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
sal_Bool IsOpaque(