[Libreoffice-commits] core.git: 72 commits - chart2/source dbaccess/source filter/source include/filter include/formula include/svx include/xmloff reportdesign/source sc/inc sc/source sd/source svx/source sw/inc sw/source xmloff/inc xmloff/source
Noel Grandin
noel at peralex.com
Fri Feb 14 13:15:56 CET 2014
chart2/source/controller/accessibility/AccessibleViewForwarder.cxx | 4
chart2/source/controller/accessibility/AccessibleViewForwarder.hxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 2
dbaccess/source/filter/xml/xmlExport.hxx | 2
filter/source/msfilter/svdfppt.cxx | 10 -
filter/source/svg/svgfilter.hxx | 2
include/filter/msfilter/msocximex.hxx | 4
include/filter/msfilter/svdfppt.hxx | 4
include/formula/IControlReferenceHandler.hxx | 2
include/svx/IAccessibleViewForwarder.hxx | 2
include/xmloff/XMLPageExport.hxx | 2
include/xmloff/XMLShapeStyleContext.hxx | 2
include/xmloff/XMLTextMasterPageContext.hxx | 8
include/xmloff/XMLTextMasterPageExport.hxx | 4
include/xmloff/XMLTextMasterStylesContext.hxx | 2
include/xmloff/XMLTextShapeStyleContext.hxx | 2
include/xmloff/prstylei.hxx | 2
include/xmloff/txtstyli.hxx | 2
include/xmloff/xmlexp.hxx | 2
include/xmloff/xmlnumfi.hxx | 2
include/xmloff/xmlstyle.hxx | 4
reportdesign/source/filter/xml/xmlExport.cxx | 2
reportdesign/source/filter/xml/xmlExport.hxx | 2
reportdesign/source/ui/dlg/Formula.cxx | 2
reportdesign/source/ui/inc/Formula.hxx | 2
sc/inc/inputopt.hxx | 62 +++----
sc/inc/markarr.hxx | 22 +-
sc/inc/miscuno.hxx | 8
sc/inc/nameuno.hxx | 10 -
sc/inc/olinetab.hxx | 8
sc/inc/optuno.hxx | 2
sc/inc/optutil.hxx | 4
sc/inc/pagepar.hxx | 44 ++---
sc/inc/paramisc.hxx | 2
sc/inc/printopt.hxx | 16 -
sc/inc/prnsave.hxx | 10 -
sc/inc/progress.hxx | 38 ++--
sc/inc/rangeseq.hxx | 20 +-
sc/inc/rangeutl.hxx | 46 ++---
sc/inc/refreshtimer.hxx | 8
sc/inc/scabstdlg.hxx | 58 +++---
sc/inc/scmatrix.hxx | 18 +-
sc/inc/styleuno.hxx | 2
sc/inc/tablink.hxx | 4
sc/inc/tabopparams.hxx | 10 -
sc/inc/textuno.hxx | 14 -
sc/inc/unowids.hxx | 4
sc/inc/viewopti.hxx | 2
sc/inc/viewuno.hxx | 8
sc/inc/xmlwrap.hxx | 8
sc/source/core/data/global2.cxx | 6
sc/source/core/data/markarr.cxx | 34 +--
sc/source/core/data/olinetab.cxx | 8
sc/source/core/data/pagepar.cxx | 10 -
sc/source/core/tool/inputopt.cxx | 8
sc/source/core/tool/interpr1.cxx | 4
sc/source/core/tool/optutil.cxx | 2
sc/source/core/tool/printopt.cxx | 2
sc/source/core/tool/prnsave.cxx | 8
sc/source/core/tool/progress.cxx | 18 +-
sc/source/core/tool/rangeseq.cxx | 32 +--
sc/source/core/tool/rangeutl.cxx | 78 ++++-----
sc/source/core/tool/refreshtimer.cxx | 6
sc/source/core/tool/scmatrix.cxx | 18 +-
sc/source/filter/dif/difimp.cxx | 16 -
sc/source/filter/excel/excform.cxx | 4
sc/source/filter/excel/excform8.cxx | 4
sc/source/filter/excel/exctools.cxx | 2
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/excel/namebuff.cxx | 18 +-
sc/source/filter/excel/tokstack.cxx | 2
sc/source/filter/excel/xeescher.cxx | 6
sc/source/filter/excel/xiescher.cxx | 8
sc/source/filter/html/htmlexp.cxx | 20 +-
sc/source/filter/html/htmlexp2.cxx | 8
sc/source/filter/inc/XclExpChangeTrack.hxx | 12 -
sc/source/filter/inc/XclImpChangeTrack.hxx | 14 -
sc/source/filter/inc/commentsbuffer.hxx | 10 -
sc/source/filter/inc/dif.hxx | 36 ++--
sc/source/filter/inc/eeimport.hxx | 2
sc/source/filter/inc/excform.hxx | 22 +-
sc/source/filter/inc/excimp8.hxx | 1
sc/source/filter/inc/excrecds.hxx | 8
sc/source/filter/inc/excscen.hxx | 2
sc/source/filter/inc/expbase.hxx | 6
sc/source/filter/inc/htmlexp.hxx | 38 ++--
sc/source/filter/inc/imp_op.hxx | 2
sc/source/filter/inc/lotform.hxx | 8
sc/source/filter/inc/lotimpop.hxx | 2
sc/source/filter/inc/lotrange.hxx | 12 -
sc/source/filter/inc/namebuff.hxx | 34 +--
sc/source/filter/inc/rtfparse.hxx | 8
sc/source/filter/inc/tokstack.hxx | 14 -
sc/source/filter/inc/xcl97esc.hxx | 6
sc/source/filter/inc/xcl97rec.hxx | 20 +-
sc/source/filter/inc/xeescher.hxx | 2
sc/source/filter/inc/xiescher.hxx | 4
sc/source/filter/lotus/lotform.cxx | 2
sc/source/filter/lotus/lotimpop.cxx | 2
sc/source/filter/lotus/op.cxx | 2
sc/source/filter/lotus/tool.cxx | 4
sc/source/filter/rtf/eeimpars.cxx | 8
sc/source/filter/rtf/expbase.cxx | 8
sc/source/filter/rtf/rtfparse.cxx | 10 -
sc/source/filter/starcalc/collect.cxx | 6
sc/source/filter/starcalc/collect.hxx | 20 +-
sc/source/filter/starcalc/scflt.cxx | 8
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 14 -
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 12 -
sc/source/filter/xcl97/xcl97esc.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 10 -
sc/source/filter/xml/XMLCodeNameProvider.cxx | 4
sc/source/filter/xml/XMLCodeNameProvider.hxx | 2
sc/source/filter/xml/XMLTableMasterPageExport.cxx | 30 +--
sc/source/filter/xml/XMLTableMasterPageExport.hxx | 6
sc/source/filter/xml/XMLTableShapeImportHelper.hxx | 4
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/filter/xml/XMLTableShapeResizer.hxx | 2
sc/source/filter/xml/XMLTableShapesContext.cxx | 2
sc/source/filter/xml/xmldpimp.cxx | 6
sc/source/filter/xml/xmldpimp.hxx | 28 +--
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlexprt.hxx | 2
sc/source/filter/xml/xmlstyli.cxx | 18 +-
sc/source/filter/xml/xmlstyli.hxx | 16 -
sc/source/filter/xml/xmlwrap.cxx | 30 +--
sc/source/ui/Accessibility/AccessibleCell.cxx | 33 +--
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 6
sc/source/ui/Accessibility/AccessibleDocument.cxx | 28 +--
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 10 -
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 4
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 4
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 8
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 4
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 2
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 86 +++++-----
sc/source/ui/Accessibility/AccessibleText.cxx | 24 +-
sc/source/ui/app/scmod.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 48 ++---
sc/source/ui/attrdlg/scdlgfact.hxx | 58 +++---
sc/source/ui/condformat/condformatdlg.cxx | 10 -
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/pvlaydlg.cxx | 2
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/tablink.cxx | 4
sc/source/ui/formdlg/formula.cxx | 15 -
sc/source/ui/inc/AccessibleCell.hxx | 12 -
sc/source/ui/inc/AccessibleCellBase.hxx | 4
sc/source/ui/inc/AccessibleContextBase.hxx | 2
sc/source/ui/inc/AccessibleDocument.hxx | 14 -
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 2
sc/source/ui/inc/AccessibleEditObject.hxx | 8
sc/source/ui/inc/AccessiblePageHeader.hxx | 6
sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 6
sc/source/ui/inc/AccessiblePreviewCell.hxx | 6
sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 8
sc/source/ui/inc/AccessiblePreviewTable.hxx | 2
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 70 ++++----
sc/source/ui/inc/AccessibleText.hxx | 76 ++++----
sc/source/ui/inc/ChildWindowWrapper.hxx | 2
sc/source/ui/inc/IAnyRefDialog.hxx | 8
sc/source/ui/inc/acredlin.hxx | 8
sc/source/ui/inc/anyrefdg.hxx | 16 -
sc/source/ui/inc/areasdlg.hxx | 2
sc/source/ui/inc/condformatdlg.hxx | 6
sc/source/ui/inc/consdlg.hxx | 2
sc/source/ui/inc/crnrdlg.hxx | 2
sc/source/ui/inc/dbnamdlg.hxx | 2
sc/source/ui/inc/filtdlg.hxx | 4
sc/source/ui/inc/formula.hxx | 10 -
sc/source/ui/inc/highred.hxx | 4
sc/source/ui/inc/namedefdlg.hxx | 4
sc/source/ui/inc/namedlg.hxx | 4
sc/source/ui/inc/optsolver.hxx | 2
sc/source/ui/inc/pvlaydlg.hxx | 2
sc/source/ui/inc/simpref.hxx | 4
sc/source/ui/inc/solvrdlg.hxx | 2
sc/source/ui/inc/tabopdlg.hxx | 2
sc/source/ui/inc/validate.hxx | 2
sc/source/ui/inc/xmlsourcedlg.hxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 14 -
sc/source/ui/miscdlgs/crnrdlg.cxx | 2
sc/source/ui/miscdlgs/highred.cxx | 4
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/miscdlgs/simpref.cxx | 6
sc/source/ui/miscdlgs/solvrdlg.cxx | 2
sc/source/ui/namedlg/namedefdlg.cxx | 4
sc/source/ui/namedlg/namedlg.cxx | 4
sc/source/ui/pagedlg/areasdlg.cxx | 4
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/miscuno.cxx | 13 -
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/optuno.cxx | 4
sc/source/ui/unoobj/textuno.cxx | 6
sc/source/ui/unoobj/viewuno.cxx | 18 +-
sc/source/ui/view/output2.cxx | 2
sc/source/ui/view/printfun.cxx | 14 -
sc/source/ui/view/tabvwsh4.cxx | 4
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 2
sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 4
sd/source/ui/inc/AccessibleViewForwarder.hxx | 2
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4
svx/source/inc/GraphCtlAccessibleContext.hxx | 2
sw/inc/accmap.hxx | 2
sw/source/core/access/accmap.cxx | 4
sw/source/filter/ww8/ww8par.hxx | 4
sw/source/filter/ww8/ww8par3.cxx | 10 -
sw/source/filter/xml/xmlexp.hxx | 2
sw/source/filter/xml/xmlfmt.cxx | 16 -
sw/source/filter/xml/xmlfmte.cxx | 2
xmloff/inc/SchXMLExport.hxx | 2
xmloff/inc/XMLFootnoteConfigurationImportContext.hxx | 2
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/core/xmlexp.cxx | 4
xmloff/source/draw/XMLShapeStyleContext.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlexp_impl.hxx | 2
xmloff/source/draw/ximpstyl.cxx | 4
xmloff/source/style/XMLPageExport.cxx | 6
xmloff/source/style/prstylei.cxx | 2
xmloff/source/style/xmlnumfi.cxx | 2
xmloff/source/style/xmlstyle.cxx | 6
xmloff/source/text/XMLAutoTextEventExport.cxx | 2
xmloff/source/text/XMLAutoTextEventExport.hxx | 2
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 2
xmloff/source/text/XMLTextMasterPageContext.cxx | 8
xmloff/source/text/XMLTextMasterPageExport.cxx | 28 +--
xmloff/source/text/XMLTextMasterStylesContext.cxx | 4
xmloff/source/text/XMLTextShapeStyleContext.cxx | 2
xmloff/source/text/txtstyli.cxx | 2
235 files changed, 1137 insertions(+), 1133 deletions(-)
New commits:
commit bb39bea2e63ec04e2cde88121d09c88e451b340e
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 14 13:56:54 2014 +0200
sal_Bool->bool
Change-Id: I475daf63c9548176f37449a26731cb176cf0ea3e
diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx
index 3a1d84f..11cf043 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
@@ -29,7 +29,7 @@ namespace formula
{
public:
virtual void ShowReference(const OUString& _sRef) = 0;
- virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
+ virtual void HideReference( bool bDoneRefMode = true ) = 0;
virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index e578436..4488f7c 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -177,7 +177,7 @@ void FormulaDialog::ShowReference(const OUString& /*_sRef*/)
{
}
// -----------------------------------------------------------------------------
-void FormulaDialog::HideReference( sal_Bool /*bDoneRefMode*/)
+void FormulaDialog::HideReference( bool /*bDoneRefMode*/)
{
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index 0f11bb4..beb4461 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -88,7 +88,7 @@ public:
// IControlReferenceHandler
virtual void ShowReference(const OUString& _sRef);
- virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
+ virtual void HideReference( bool bDoneRefMode = true );
virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 0df5f0c..e0c4d18 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -501,7 +501,7 @@ void ScFormulaDlg::ShowReference(const OUString& _sFormula)
{
m_aHelper.ShowReference(_sFormula);
}
-void ScFormulaDlg::HideReference( sal_Bool bDoneRefMode )
+void ScFormulaDlg::HideReference( bool bDoneRefMode )
{
m_aHelper.HideReference(bDoneRefMode);
}
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 65045fd..751f00d 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -130,7 +130,7 @@ private:
protected:
- virtual sal_Bool DoClose( sal_uInt16 nId );
+ virtual bool DoClose( sal_uInt16 nId );
void SetDispatcherLock( bool bLock );
@@ -156,7 +156,7 @@ public:
virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const;
virtual void ShowReference(const OUString& rStr);
- virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
+ virtual void HideReference( bool bDoneRefMode = true );
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
@@ -170,7 +170,7 @@ public:
bool EnterRefMode();
bool LeaveRefMode();
inline bool CanInputStart( const formula::RefEdit *pEdit );
- inline bool CanInputDone( sal_Bool bForced );
+ inline bool CanInputDone( bool bForced );
};
//============================================================================
@@ -322,7 +322,7 @@ inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit )
return m_aHelper.CanInputStart( pEdit );
}
-inline bool ScRefHandler::CanInputDone( sal_Bool bForced )
+inline bool ScRefHandler::CanInputDone( bool bForced )
{
return m_aHelper.CanInputDone( bForced );
}
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index c8473a0..4850a24 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -87,7 +87,7 @@ public:
// sc::IAnyRefDialog
virtual void ShowReference(const OUString& _sRef);
- virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
+ virtual void HideReference( bool bDoneRefMode = true );
virtual void SetReference( const ScRange& rRef, ScDocument* pD );
virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 49d5cb9..a89077e 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -910,10 +910,10 @@ bool ScRefHandler::IsRefInputMode() const
//----------------------------------------------------------------------------
-sal_Bool ScRefHandler::DoClose( sal_uInt16 nId )
+bool ScRefHandler::DoClose( sal_uInt16 nId )
{
m_aHelper.DoClose(nId);
- return sal_True;
+ return true;
}
void ScRefHandler::SetDispatcherLock( bool bLock )
@@ -1009,7 +1009,7 @@ bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, S
return m_aHelper.ParseWithNames( rRanges, rStr, pDoc );
}
// -----------------------------------------------------------------------------
-void ScRefHandler::HideReference( sal_Bool bDoneRefMode )
+void ScRefHandler::HideReference( bool bDoneRefMode )
{
m_aHelper.HideReference( bDoneRefMode );
}
commit 6c5c56848cd8de45fd016d2ba102e1e3db3ae643
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 15:29:40 2014 +0200
sal_Bool->bool
Change-Id: I33f17c16a4d44a68b535fad370fba24f68df6317
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 941d650..c32f3a8 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -81,10 +81,10 @@ public:
SCTAB nTable;
SCCOL nCol;
SCROW nRow;
- sal_uLong nActionNo;
- sal_uLong nInfo;
- sal_Bool bIsRejectable;
- sal_Bool bIsAcceptable;
+ sal_uLong nActionNo;
+ sal_uLong nInfo;
+ bool bIsRejectable;
+ bool bIsAcceptable;
};
typedef long LExpNum;
commit c6d99137824101199c8bc1300ef927529539aace
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 15:28:23 2014 +0200
sal_Bool->bool
Change-Id: I2357e07427778fdd7e53aaf964f5879a14937ddd
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 940de73..2891094 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -437,20 +437,20 @@ void ScCondFormatDlg::SetActive()
RefInputDone();
}
-void ScCondFormatDlg::RefInputDone( sal_Bool bForced )
+void ScCondFormatDlg::RefInputDone( bool bForced )
{
ScAnyRefModalDlg::RefInputDone(bForced);
}
-sal_Bool ScCondFormatDlg::IsTableLocked() const
+bool ScCondFormatDlg::IsTableLocked() const
{
if (mpLastEdit && mpLastEdit != mpEdRange)
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
-sal_Bool ScCondFormatDlg::IsRefInputMode() const
+bool ScCondFormatDlg::IsRefInputMode() const
{
return mpEdRange->IsEnabled();
}
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 20e5e2b..6deb0f1 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -382,7 +382,7 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName )
//------------------------------------------------------------------------
-sal_Bool ScDbNameDlg::IsRefInputMode() const
+bool ScDbNameDlg::IsRefInputMode() const
{
return bRefInputMode;
}
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index c713e2a..c9db0d3 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -684,7 +684,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
//----------------------------------------------------------------------------
-sal_Bool ScFilterDlg::IsRefInputMode() const
+bool ScFilterDlg::IsRefInputMode() const
{
return bRefInputMode;
}
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 1e4973b..dc616fb 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -1392,7 +1392,7 @@ void ScPivotLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDoc )
}
}
-sal_Bool ScPivotLayoutDlg::IsRefInputMode() const
+bool ScPivotLayoutDlg::IsRefInputMode() const
{
return mbRefInputMode;
}
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index c92b71a..fc71e9e 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -279,7 +279,7 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam,
//----------------------------------------------------------------------------
-sal_Bool ScSpecialFilterDlg::IsRefInputMode() const
+bool ScSpecialFilterDlg::IsRefInputMode() const
{
return bRefInputMode;
}
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 9912c25..0df5f0c 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -381,7 +381,8 @@ void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* p
m_aHelper.RefInputStart( aPair.second, aPair.first);
RefInputStartAfter( aPair.second, aPair.first );
}
-void ScFormulaDlg::RefInputDone( sal_Bool bForced )
+
+void ScFormulaDlg::RefInputDone( bool bForced )
{
m_aHelper.RefInputDone( bForced );
RefInputDoneAfter( bForced );
@@ -447,21 +448,21 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
}
}
-sal_Bool ScFormulaDlg::IsRefInputMode() const
+bool ScFormulaDlg::IsRefInputMode() const
{
const IFunctionDescription* pDesc = getCurrentFunctionDescription();
- sal_Bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL);
+ bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL);
return bRef;
}
-sal_Bool ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const
+bool ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const
{
// not allowed: different from this doc, and no name
// pDocSh is always a ScDocShell
if ( pDocSh && ((ScDocShell*)pDocSh)->GetDocument() != pDoc && !pDocSh->HasName() )
return false;
- return sal_True; // everything else is allowed
+ return true; // everything else is allowed
}
void ScFormulaDlg::SetActive()
@@ -512,7 +513,7 @@ void ScFormulaDlg::AddRefEntry( )
{
}
-sal_Bool ScFormulaDlg::IsTableLocked( ) const
+bool ScFormulaDlg::IsTableLocked( ) const
{
// per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden
return false;
diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx
index d9a765b..12ff8a9 100644
--- a/sc/source/ui/inc/IAnyRefDialog.hxx
+++ b/sc/source/ui/inc/IAnyRefDialog.hxx
@@ -37,11 +37,11 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0;
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0;
- virtual void RefInputDone( sal_Bool bForced = false ) = 0;
- virtual sal_Bool IsTableLocked() const = 0;
- virtual sal_Bool IsRefInputMode() const = 0;
+ virtual void RefInputDone( bool bForced = false ) = 0;
+ virtual bool IsTableLocked() const = 0;
+ virtual bool IsRefInputMode() const = 0;
- virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0;
+ virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0;
virtual void AddRefEntry() = 0;
virtual void SetActive() = 0;
virtual void ViewShellChanged() = 0;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 873a4c3..65045fd 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -135,7 +135,7 @@ protected:
void SetDispatcherLock( bool bLock );
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
- virtual void RefInputDone( sal_Bool bForced = false );
+ virtual void RefInputDone( bool bForced = false );
void ShowSimpleReference(const OUString& rStr);
void ShowFormulaReference(const OUString& rStr);
@@ -151,9 +151,9 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0;
virtual void AddRefEntry();
- virtual sal_Bool IsRefInputMode() const;
- virtual sal_Bool IsTableLocked() const;
- virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const;
+ virtual bool IsRefInputMode() const;
+ virtual bool IsTableLocked() const;
+ virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const;
virtual void ShowReference(const OUString& rStr);
virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 22c8a21..23a6120 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -41,7 +41,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
virtual void AddRefEntry();
- virtual sal_Bool IsTableLocked() const;
+ virtual bool IsTableLocked() const;
virtual void SetActive();
virtual void Deactivate();
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 8b64605..5b8effe 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -107,7 +107,7 @@ private:
DECL_LINK( EdRangeModifyHdl, Edit* );
protected:
- virtual void RefInputDone( sal_Bool bForced = false );
+ virtual void RefInputDone( bool bForced = false );
public:
@@ -118,9 +118,9 @@ public:
SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const;
virtual void SetReference(const ScRange&, ScDocument*);
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
- virtual sal_Bool IsTableLocked() const;
+ virtual bool IsTableLocked() const;
void InvalidateRefData();
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 4120f31..9d4d6c5 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -45,7 +45,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const { return sal_True; }
+ virtual bool IsRefInputMode() const { return true; }
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index dd1077b..71f50e3 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -42,7 +42,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index 7ea6ad6..f89719f 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -44,7 +44,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 0f2d71a..eb1a6d2 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -61,7 +61,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
@@ -169,7 +169,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 9209224..c8473a0 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -92,11 +92,11 @@ public:
virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
- virtual void RefInputDone( sal_Bool bForced = false );
- virtual sal_Bool IsTableLocked() const;
- virtual sal_Bool IsRefInputMode() const;
+ virtual void RefInputDone( bool bForced = false );
+ virtual bool IsTableLocked() const;
+ virtual bool IsRefInputMode() const;
- virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const;
+ virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const;
virtual void AddRefEntry();
virtual void SetActive();
virtual void ViewShellChanged();
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 6370eba..25a940e 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -78,7 +78,7 @@ private:
protected:
- virtual void RefInputDone( sal_Bool bForced = false );
+ virtual void RefInputDone( bool bForced = false );
public:
ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
@@ -89,7 +89,7 @@ public:
virtual void SetActive();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
virtual sal_Bool Close();
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
};
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 185a3c2..18164a7 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -70,7 +70,7 @@ private:
DECL_LINK( AssignGetFocusHdl, void * );
protected:
- virtual void RefInputDone( sal_Bool bForced = sal_False );
+ virtual void RefInputDone( bool bForced = false );
public:
ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
@@ -80,7 +80,7 @@ public:
virtual ~ScNameDefDlg() {};
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index b6ed196..2ef08a1 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -119,7 +119,7 @@ private:
DECL_LINK( ScopeChangedHdl, void* );
protected:
- virtual void RefInputDone( sal_Bool bForced = sal_False );
+ virtual void RefInputDone( bool bForced = false );
public:
ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
@@ -128,7 +128,7 @@ public:
virtual ~ScNameDlg();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index f4af6ef..a944145 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -101,7 +101,7 @@ public:
~ScOptSolverDlg();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index 7f3f4c0..a56bc7b 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -140,7 +140,7 @@ public:
protected:
virtual void Deactivate();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index c61d1d2..5fd1751 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -68,7 +68,7 @@ private:
protected:
- virtual void RefInputDone( sal_Bool bForced = false );
+ virtual void RefInputDone( bool bForced = false );
public:
ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
@@ -77,7 +77,7 @@ public:
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index bc48636..e4efd8e 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -50,7 +50,7 @@ public:
~ScSolverDlg();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index 6c4f141..5144553 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -51,7 +51,7 @@ public:
~ScTabOpDlg();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual sal_Bool IsRefInputMode() const { return sal_True; }
+ virtual bool IsRefInputMode() const { return true; }
virtual void SetActive();
virtual sal_Bool Close();
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 79c63ff..5c3094c 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -153,7 +153,7 @@ public:
(m_pHandler->*m_pRefInputStartPostHdl)( pEdit, pButton );
}
- virtual void RefInputDone( sal_Bool bForced = false )
+ virtual void RefInputDone( bool bForced = false )
{
if( !CanInputDone( bForced ) )
return;
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index e71b9df..5566371 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -58,7 +58,7 @@ public:
ScXMLSourceDlg(
SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc);
- virtual sal_Bool IsRefInputMode() const;
+ virtual bool IsRefInputMode() const;
virtual void SetReference(const ScRange& rRange, ScDocument* pDoc);
virtual void Deactivate();
virtual void SetActive();
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 86eb2da..49d5cb9 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -890,7 +890,7 @@ void ScRefHandler::SwitchToDocument()
//----------------------------------------------------------------------------
-sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0
+bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0
{
// default: allow only same document (overridden in function dialog)
OUString aCmpName;
@@ -903,7 +903,7 @@ sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh ma
//----------------------------------------------------------------------------
-sal_Bool ScRefHandler::IsRefInputMode() const
+bool ScRefHandler::IsRefInputMode() const
{
return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen
}
@@ -937,7 +937,7 @@ void ScRefHandler::AddRefEntry()
//----------------------------------------------------------------------------
-sal_Bool ScRefHandler::IsTableLocked() const
+bool ScRefHandler::IsTableLocked() const
{
// per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden
@@ -1024,7 +1024,7 @@ void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB
m_aHelper.ReleaseFocus( pEdit,pButton );
}
//----------------------------------------------------------------------------
-void ScRefHandler::RefInputDone( sal_Bool bForced )
+void ScRefHandler::RefInputDone( bool bForced )
{
m_aHelper.RefInputDone( bForced );
}
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 93f3676..8488b6e 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -661,7 +661,7 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, sal_Bool bCo
#*
#************************************************************************/
-sal_Bool ScColRowNameRangesDlg::IsRefInputMode() const
+bool ScColRowNameRangesDlg::IsRefInputMode() const
{
return (pEdActive != NULL);
}
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index f18a9db..f57e5de 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -155,7 +155,7 @@ sal_Bool ScHighlightChgDlg::Close()
return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() );
}
-void ScHighlightChgDlg::RefInputDone( sal_Bool bForced)
+void ScHighlightChgDlg::RefInputDone( bool bForced)
{
ScAnyRefDlg::RefInputDone(bForced);
if(bForced || !m_pRbAssign->IsVisible())
@@ -171,7 +171,7 @@ void ScHighlightChgDlg::SetActive()
{
}
-sal_Bool ScHighlightChgDlg::IsRefInputMode() const
+bool ScHighlightChgDlg::IsRefInputMode() const
{
return m_pEdAssign->IsVisible();
}
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 8a0bd4d..9eac4ab 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -528,7 +528,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
//----------------------------------------------------------------------------
-sal_Bool ScOptSolverDlg::IsRefInputMode() const
+bool ScOptSolverDlg::IsRefInputMode() const
{
return mpEdActive != NULL;
}
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 0fec6bb..c156e9c 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -145,9 +145,9 @@ void ScSimpleRefDlg::SetActive()
RefInputDone();
}
//------------------------------------------------------------------------
-sal_Bool ScSimpleRefDlg::IsRefInputMode() const
+bool ScSimpleRefDlg::IsRefInputMode() const
{
- return sal_True;
+ return true;
}
OUString ScSimpleRefDlg::GetRefString() const
@@ -187,7 +187,7 @@ void ScSimpleRefDlg::StartRefInput()
bCloseFlag=sal_True;
}
-void ScSimpleRefDlg::RefInputDone( sal_Bool bForced)
+void ScSimpleRefDlg::RefInputDone( bool bForced)
{
ScAnyRefDlg::RefInputDone(bForced);
if ( (bForced || bCloseOnButtonUp) && bCloseFlag )
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index e418f99..1ad2c2c 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -185,7 +185,7 @@ void ScSolverDlg::RaiseError( ScSolverErr eError )
//----------------------------------------------------------------------------
-sal_Bool ScSolverDlg::IsRefInputMode() const
+bool ScSolverDlg::IsRefInputMode() const
{
return pEdActive != NULL;
}
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 62e13fd..10a0dfd 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -270,12 +270,12 @@ void ScNameDefDlg::GetNewData(OUString& rName, OUString& rScope)
rScope = maScope;
}
-sal_Bool ScNameDefDlg::IsRefInputMode() const
+bool ScNameDefDlg::IsRefInputMode() const
{
return m_pEdRange->IsEnabled();
}
-void ScNameDefDlg::RefInputDone( sal_Bool bForced)
+void ScNameDefDlg::RefInputDone( bool bForced)
{
ScAnyRefDlg::RefInputDone(bForced);
IsNameValid();
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 7b0ea1d..a6c1edf 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -155,12 +155,12 @@ void ScNameDlg::Init()
}
-sal_Bool ScNameDlg::IsRefInputMode() const
+bool ScNameDlg::IsRefInputMode() const
{
return m_pEdAssign->IsEnabled();
}
-void ScNameDlg::RefInputDone( sal_Bool bForced)
+void ScNameDlg::RefInputDone( bool bForced)
{
ScAnyRefDlg::RefInputDone(bForced);
EdModifyHdl(m_pEdAssign);
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 3085f8d..a96286e 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -171,12 +171,12 @@ sal_Bool ScPrintAreasDlg::Close()
//----------------------------------------------------------------------------
-sal_Bool ScPrintAreasDlg::IsTableLocked() const
+bool ScPrintAreasDlg::IsTableLocked() const
{
// Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn,
// bei der Eingabe die Tabelle umzuschalten
- return sal_True;
+ return true;
}
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 5cd3cbd..3e20b56 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -118,7 +118,7 @@ ScXMLSourceDlg::ScXMLSourceDlg(
mpBtnSelectSource->GrabFocus(); // Initial focus is on the select source button.
}
-sal_Bool ScXMLSourceDlg::IsRefInputMode() const
+bool ScXMLSourceDlg::IsRefInputMode() const
{
return mpActiveEdit != NULL && mpActiveEdit->IsEnabled();
}
commit 8cdcfc7b490135540b0487ca8761321a75a509d9
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 15:09:51 2014 +0200
sal_Bool->bool
Change-Id: I8d624b376541fab53945c28b726eda582dba0edd
diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx
index a9bc144..b61853e 100644
--- a/sc/source/ui/inc/ChildWindowWrapper.hxx
+++ b/sc/source/ui/inc/ChildWindowWrapper.hxx
@@ -49,7 +49,7 @@ public:
}
static void RegisterChildWindow (
- sal_Bool bVisible = sal_False,
+ bool bVisible = false,
SfxModule* pModule = NULL,
sal_uInt16 nFlags = 0)
{
commit 2d9025dad498fc5e56406835f6489c99927ccf8c
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:57:48 2014 +0200
sal_Bool->bool
Change-Id: Id51005576c6c4a08eb2de32fe8a51dd4331808a6
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 0c82f17..5fa62bd 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -946,7 +946,7 @@ SvxViewForwarder* ScAccessibleCellTextData::GetViewForwarder()
return mpViewForwarder;
}
-SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( sal_Bool /* bCreate */ )
+SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( bool /* bCreate */ )
{
//#102219#; there should no EditViewForwarder be, because the cell is now readonly in this interface
return NULL;
@@ -976,7 +976,7 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell)
}
-ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone)
+ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone)
:
mpViewForwarder(NULL),
mpEditViewForwarder(NULL),
@@ -1027,7 +1027,7 @@ void ScAccessibleEditObjectTextData::Notify( SfxBroadcaster& rBC, const SfxHint&
ScAccessibleTextData* ScAccessibleEditObjectTextData::Clone() const
{
// Add para to indicate the object is cloned
- return new ScAccessibleEditObjectTextData(mpEditView, mpWindow,sal_True);
+ return new ScAccessibleEditObjectTextData(mpEditView, mpWindow, true);
}
SvxTextForwarder* ScAccessibleEditObjectTextData::GetTextForwarder()
@@ -1055,7 +1055,7 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder()
return mpViewForwarder;
}
-SvxEditViewForwarder* ScAccessibleEditObjectTextData::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* ScAccessibleEditObjectTextData::GetEditViewForwarder( bool bCreate )
{
if (!mpEditViewForwarder && mpEditView)
mpEditViewForwarder = new ScEditViewForwarder(mpEditView, mpWindow);
@@ -1160,7 +1160,7 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
mpEditEngine = new ScFieldEditEngine(NULL, pEnginePool, NULL, true);
- mbEditEngineCreated = sal_True;
+ mbEditEngineCreated = true;
mpEditEngine->EnableUndo( false );
mpEditEngine->SetRefMapMode( MAP_100TH_MM );
mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);
@@ -1180,7 +1180,7 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
return mpForwarder;
}
-SvxEditViewForwarder* ScAccessibleEditLineTextData::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* ScAccessibleEditLineTextData::GetEditViewForwarder( bool bCreate )
{
ScTextWnd* pTxtWnd = dynamic_cast<ScTextWnd*>(mpWindow);
@@ -1328,7 +1328,7 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh
// ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object
ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
- const OUString& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader)
+ const OUString& rText, const ScAddress& rP, bool bColHeader, bool bRowHeader)
: ScAccessibleCellBaseTextData(GetDocShell(pViewShell), rP),
mpViewForwarder(NULL),
mpViewShell(pViewShell),
@@ -1435,7 +1435,7 @@ ScDocShell* ScAccessiblePreviewHeaderCellTextData::GetDocShell(ScPreviewShell* p
}
ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShell,
- const EditTextObject* pEditObj, sal_Bool bHeader, SvxAdjust eAdjust)
+ const EditTextObject* pEditObj, bool bHeader, SvxAdjust eAdjust)
:
mpViewForwarder(NULL),
mpViewShell(pViewShell),
@@ -1537,7 +1537,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
if (mpEditObj)
mpEditEngine->SetText(*mpEditObj);
- mbDataValid = sal_True;
+ mbDataValid = true;
return mpForwarder;
}
@@ -1549,7 +1549,7 @@ SvxViewForwarder* ScAccessibleHeaderTextData::GetViewForwarder()
}
ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
- const OUString& sText, const ScAddress& aCellPos, sal_Bool bMarkNote)
+ const OUString& sText, const ScAddress& aCellPos, bool bMarkNote)
:
mpViewForwarder(NULL),
mpViewShell(pViewShell),
@@ -1644,7 +1644,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
mpEditEngine->SetText( msText );
}
- mbDataValid = sal_True;
+ mbDataValid = true;
if (mpEditEngine)
mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) );
@@ -1768,7 +1768,7 @@ SvxViewForwarder* ScAccessibleCsvTextData::GetViewForwarder()
return mpViewForwarder.get();
}
-SvxEditViewForwarder* ScAccessibleCsvTextData::GetEditViewForwarder( sal_Bool /* bCreate */ )
+SvxEditViewForwarder* ScAccessibleCsvTextData::GetEditViewForwarder( bool /* bCreate */ )
{
return NULL;
}
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index 463a0f5..acea9d8 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -52,12 +52,12 @@ public:
virtual SvxTextForwarder* GetTextForwarder() = 0;
virtual SvxViewForwarder* GetViewForwarder() = 0;
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) = 0;
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) = 0;
virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; }
virtual void UpdateData() = 0;
- virtual void SetDoUpdate(sal_Bool bValue) = 0;
- virtual sal_Bool IsDirty() const = 0;
+ virtual void SetDoUpdate(bool bValue) = 0;
+ virtual bool IsDirty() const = 0;
private:
mutable SfxBroadcaster maBroadcaster;
@@ -80,8 +80,8 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); }
virtual void UpdateData() { ScCellTextData::UpdateData(); }
- virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); }
- virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); }
+ virtual void SetDoUpdate(bool bValue) { ScCellTextData::SetDoUpdate(bValue); }
+ virtual bool IsDirty() const { return ScCellTextData::IsDirty(); }
};
@@ -102,7 +102,7 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate );
DECL_LINK( NotifyHdl, EENotify* );
protected:
@@ -128,7 +128,7 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData
{
public:
// Add a para to indicate whether the object is cloned
- ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone=sal_False);
+ ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone = false);
virtual ~ScAccessibleEditObjectTextData();
virtual ScAccessibleTextData* Clone() const;
@@ -137,21 +137,21 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate );
virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool /* bValue */) { }
- virtual sal_Bool IsDirty() const { return false; }
+ virtual void SetDoUpdate(bool /* bValue */) { }
+ virtual bool IsDirty() const { return false; }
DECL_LINK( NotifyHdl, EENotify* );
protected:
ScEditObjectViewForwarder* mpViewForwarder;
- ScEditViewForwarder* mpEditViewForwarder;
- EditView* mpEditView;
- EditEngine* mpEditEngine;
- SvxEditEngineForwarder* mpForwarder;
- Window* mpWindow;
- sal_Bool mbIsCloned;
+ ScEditViewForwarder* mpEditViewForwarder;
+ EditView* mpEditView;
+ EditEngine* mpEditEngine;
+ SvxEditEngineForwarder* mpForwarder;
+ Window* mpWindow;
+ bool mbIsCloned;
};
@@ -166,7 +166,7 @@ public:
virtual ScAccessibleTextData* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate );
void Dispose();
void TextChanged();
@@ -175,7 +175,7 @@ public:
private:
void ResetEditMode();
- sal_Bool mbEditEngineCreated;
+ bool mbEditEngineCreated;
};
@@ -194,7 +194,7 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; }
private:
ScPreviewViewForwarder* mpViewForwarder;
@@ -214,7 +214,7 @@ class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextDat
{
public:
ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
- const OUString& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader);
+ const OUString& rText, const ScAddress& rP, bool bColHeader, bool bRowHeader);
virtual ~ScAccessiblePreviewHeaderCellTextData();
virtual ScAccessibleTextData* Clone() const;
@@ -223,14 +223,14 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
OUString maText;
- sal_Bool mbColHeader;
- sal_Bool mbRowHeader;
+ bool mbColHeader;
+ bool mbRowHeader;
// prevent the using of this method of the base class
ScCellEditSource* GetOriginalSource() { return NULL; }
@@ -246,7 +246,7 @@ class ScAccessibleHeaderTextData : public ScAccessibleTextData
{
public:
ScAccessibleHeaderTextData(ScPreviewShell* pViewShell,
- const EditTextObject* pEditObj, sal_Bool bHeader, SvxAdjust eAdjust);
+ const EditTextObject* pEditObj, bool bHeader, SvxAdjust eAdjust);
virtual ~ScAccessibleHeaderTextData();
virtual ScAccessibleTextData* Clone() const;
@@ -255,11 +255,11 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; }
virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool /* bValue */) { }
- virtual sal_Bool IsDirty() const { return false; }
+ virtual void SetDoUpdate(bool /* bValue */) { }
+ virtual bool IsDirty() const { return false; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
@@ -267,8 +267,8 @@ private:
SvxEditEngineForwarder* mpForwarder;
ScDocShell* mpDocSh;
const EditTextObject* mpEditObj;
- sal_Bool mbHeader;
- sal_Bool mbDataValid;
+ bool mbHeader;
+ bool mbDataValid;
SvxAdjust meAdjust;
};
@@ -279,7 +279,7 @@ class ScAccessibleNoteTextData : public ScAccessibleTextData
{
public:
ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
- const OUString& sText, const ScAddress& aCellPos, sal_Bool bMarkNote);
+ const OUString& sText, const ScAddress& aCellPos, bool bMarkNote);
virtual ~ScAccessibleNoteTextData();
virtual ScAccessibleTextData* Clone() const;
@@ -288,11 +288,11 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; }
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; }
virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool /* bValue */) { }
- virtual sal_Bool IsDirty() const { return false; }
+ virtual void SetDoUpdate(bool /* bValue */) { }
+ virtual bool IsDirty() const { return false; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
@@ -301,8 +301,8 @@ private:
ScDocShell* mpDocSh;
OUString msText;
ScAddress maCellPos;
- sal_Bool mbMarkNote;
- sal_Bool mbDataValid;
+ bool mbMarkNote;
+ bool mbDataValid;
};
@@ -337,11 +337,11 @@ public:
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate );
virtual void UpdateData() {}
- virtual void SetDoUpdate( sal_Bool /* bValue */ ) {}
- virtual sal_Bool IsDirty() const { return false; }
+ virtual void SetDoUpdate( bool /* bValue */ ) {}
+ virtual bool IsDirty() const { return false; }
};
commit bd5606b6c92a1cf37ced9b1aa0a742fa77fa4a06
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:52:58 2014 +0200
sal_Bool->bool
Change-Id: I4ae27d301b81652eb3e172057c63d46794f25c72
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index b089a39..9c1a093 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -128,12 +128,12 @@ ScMyAddress ScAccessibleSpreadsheet::CalcScAddressFromRangeList(ScRangeList *pMa
return ScMyAddress(0,0,maActiveCell.Tab());
}
-sal_Bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize)
+bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize)
{
//Src Must be :Src > Dest
if (pDest->In(*pSrc))
{//Here is Src In Dest,Src <= Dest
- return sal_False;
+ return false;
}
if (!pDest->Intersects(*pSrc))
{
@@ -142,7 +142,7 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange
* sal_uInt32(pDest->aEnd.Tab() - pDest->aStart.Tab() + 1);
if (nCellCount + nSize > nMax)
{
- return sal_True;
+ return true;
}
else if(nCellCount > 0)
{
@@ -155,7 +155,7 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange
}
}
}
- return sal_False;
+ return false;
}
sal_Int32 nMinRow = pSrc->aStart.Row();
sal_Int32 nMaxRow = pSrc->aEnd.Row();
@@ -165,7 +165,7 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange
{
if (nSize > nMax)
{
- return sal_True;
+ return true;
}
ScMyAddress cell(col,nMinRow,pSrc->aStart.Tab());
if(!pDest->In(cell))
@@ -180,7 +180,7 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange
{
if (nSize > nMax)
{
- return sal_True;
+ return true;
}
ScMyAddress cell(col,nMaxRow,pSrc->aStart.Tab());
if(!pDest->In(cell))
@@ -191,22 +191,22 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeDifferenceMax(ScRange *pSrc,ScRange
}
}
}
- return sal_False;
+ return false;
}
//In Src , Not in Dest
-sal_Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet)
+bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet)
{
if (pSrc == NULL || pDest == NULL)
{
- return sal_False;
+ return false;
}
int nSize =0;
if (pDest->GetCellCount() == 0)//if the Dest Rang List is empty
{
if (pSrc->GetCellCount() > sal_uInt32(nMax))//if the Src Cell count is greater then nMax
{
- return sal_True;
+ return true;
}
//now the cell count is less then nMax
vecRet.reserve(10);
@@ -222,7 +222,7 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(ScRangeList *pSrc
}
}
}
- return sal_False;
+ return false;
}
//the Dest Rang List is not empty
vecRet.reserve(10);
@@ -236,11 +236,11 @@ sal_Bool ScAccessibleSpreadsheet::CalcScRangeListDifferenceMax(ScRangeList *pSrc
ScRange* pRangeDest = (*pDest)[j];
if (CalcScRangeDifferenceMax(pRange,pRangeDest,nMax,vecRet,nSize))
{
- return sal_True;
+ return true;
}
}
}
- return sal_False;
+ return false;
}
//===== internal ============================================================
@@ -255,9 +255,9 @@ ScAccessibleSpreadsheet::ScAccessibleSpreadsheet(
:
ScAccessibleTableBase (pAccDoc, GetDocument(pViewShell),
ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab))),
- mbIsSpreadsheet( sal_True ),
- m_bFormulaMode(sal_False),
- m_bFormulaLastMode(sal_False),
+ mbIsSpreadsheet( true ),
+ m_bFormulaMode( false ),
+ m_bFormulaLastMode( false ),
m_nMinX(0),m_nMaxX(0),m_nMinY(0),m_nMaxY(0)
{
ConstructScAccessibleSpreadsheet( pAccDoc, pViewShell, nTab, eSplitPos );
@@ -326,7 +326,7 @@ void SAL_CALL ScAccessibleSpreadsheet::disposing()
ScAccessibleTableBase::disposing();
}
-void ScAccessibleSpreadsheet::CompleteSelectionChanged(sal_Bool bNewState)
+void ScAccessibleSpreadsheet::CompleteSelectionChanged(bool bNewState)
{
if (IsFormulaMode())
{
@@ -436,7 +436,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
if (m_bFormulaLastMode)
{//Last Notify Mode Is Formula Mode.
m_vecFormulaLastMyAddr.clear();
- RemoveFormulaSelection(sal_True);
+ RemoveFormulaSelection(true);
m_pAccFormulaCell.clear();
//Remove All Selection
}
@@ -667,7 +667,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
(rRef.GetRange().aEnd.Row() == maRange.aEnd.Row())))
{
// ignore next SC_HINT_DATACHANGED notification
- mbDelIns = sal_True;
+ mbDelIns = true;
sal_Int16 nId(0);
SCsCOL nX(rRef.GetDx());
@@ -766,7 +766,7 @@ void ScAccessibleSpreadsheet::CommitFocusCell(const ScAddress &aNewCell)
CommitChange(aEvent);
}
-sal_Bool ScAccessibleSpreadsheet::IsSameMarkCell()
+bool ScAccessibleSpreadsheet::IsSameMarkCell()
{
return m_LastMarkedRanges == *mpMarkedRanges;
}
@@ -1225,16 +1225,16 @@ void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int32 nChild
ScAddress(static_cast<SCCOL>(nCol), nRow,mpViewShell->GetViewData()->GetTabNo()))
)
{
- SelectCell(nRow, nCol, sal_True);
+ SelectCell(nRow, nCol, true);
}
return ;
}
if (mpViewShell->GetViewData()->GetMarkData().IsCellMarked(static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow)))
- SelectCell(nRow, nCol, sal_True);
+ SelectCell(nRow, nCol, true);
}
}
-void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, sal_Bool bDeselect)
+void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, bool bDeselect)
{
if (IsFormulaMode())
{
@@ -1379,29 +1379,29 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBox() const
return aRect;
}
-sal_Bool ScAccessibleSpreadsheet::IsDefunc(
+bool ScAccessibleSpreadsheet::IsDefunc(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
}
-sal_Bool ScAccessibleSpreadsheet::IsEditable(
+bool ScAccessibleSpreadsheet::IsEditable(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
if (IsFormulaMode())
{
- return sal_False;
+ return false;
}
sal_Bool bProtected(false);
if (mpDoc && mpDoc->IsTabProtected(maRange.aStart.Tab()))
- bProtected = sal_True;
+ bProtected = true;
return !bProtected;
}
-sal_Bool ScAccessibleSpreadsheet::IsFocused()
+bool ScAccessibleSpreadsheet::IsFocused()
{
- sal_Bool bFocused(false);
+ bool bFocused(false);
if (mpViewShell)
{
if (mpViewShell->GetViewData()->GetActivePart() == meSplitPos)
@@ -1410,21 +1410,21 @@ sal_Bool ScAccessibleSpreadsheet::IsFocused()
return bFocused;
}
-sal_Bool ScAccessibleSpreadsheet::IsCompleteSheetSelected()
+bool ScAccessibleSpreadsheet::IsCompleteSheetSelected()
{
if (IsFormulaMode())
{
- return sal_False;
+ return false;
}
- sal_Bool bResult(false);
+ bool bResult(false);
if(mpViewShell)
{
//#103800#; use a copy of MarkData
ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData());
aMarkData.MarkToMulti();
if (aMarkData.IsAllMarked(maRange))
- bResult = sal_True;
+ bResult = true;
}
return bResult;
}
@@ -1552,7 +1552,7 @@ void ScAccessibleSpreadsheet::FireFirstCellFocus()
{
return ;
}
- mbIsFocusSend = sal_True;
+ mbIsFocusSend = true;
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
aEvent.Source = uno::Reference< XAccessible >(this);
@@ -1655,7 +1655,7 @@ void ScAccessibleSpreadsheet::NotifyRefMode()
m_aFormulaActiveCell = aFormulaAddr;
}
-void ScAccessibleSpreadsheet::RemoveFormulaSelection(sal_Bool bRemoveAll )
+void ScAccessibleSpreadsheet::RemoveFormulaSelection(bool bRemoveAll )
{
AccessibleEventObject aEvent;
aEvent.Source = uno::Reference< XAccessible >(this);
@@ -1678,18 +1678,18 @@ void ScAccessibleSpreadsheet::RemoveFormulaSelection(sal_Bool bRemoveAll )
}
}
-sal_Bool ScAccessibleSpreadsheet::IsScAddrFormulaSel(const ScAddress &addr) const
+bool ScAccessibleSpreadsheet::IsScAddrFormulaSel(const ScAddress &addr) const
{
if( addr.Col() >= m_nMinX && addr.Col() <= m_nMaxX &&
addr.Row() >= m_nMinY && addr.Row() <= m_nMaxY &&
addr.Tab() == mpViewShell->GetViewData()->GetTabNo() )
{
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool ScAccessibleSpreadsheet::CheckChildIndex(sal_Int32 nIndex) const
+bool ScAccessibleSpreadsheet::CheckChildIndex(sal_Int32 nIndex) const
{
sal_Int32 nMaxIndex = (m_nMaxX - m_nMinX +1)*(m_nMaxY - m_nMinY +1) -1 ;
return nIndex <= nMaxIndex && nIndex >= 0 ;
@@ -1721,14 +1721,14 @@ sal_Int32 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sa
return GetRowAll() * nRowRelative + nColRelative;
}
-sal_Bool ScAccessibleSpreadsheet::IsFormulaMode()
+bool ScAccessibleSpreadsheet::IsFormulaMode()
{
ScViewData *pViewData = mpViewShell->GetViewData();
m_bFormulaMode = pViewData->IsRefMode() || SC_MOD()->IsFormulaMode();
return m_bFormulaMode ;
}
-sal_Bool ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr)
+bool ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr)
{
ScViewData *pViewData = mpViewShell->GetViewData();
sal_uInt16 nRefX=0;
@@ -1746,9 +1746,9 @@ sal_Bool ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr)
if( /* Always true: nRefX >= 0 && */ nRefX <= MAXCOL && nRefY >= 0 && nRefY <= MAXROW)
{
addr = ScAddress(nRefX,nRefY,pViewData->GetTabNo());
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
uno::Reference < XAccessible > ScAccessibleSpreadsheet::GetActiveCell()
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 1727dfd..e3bdd01 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -40,7 +40,7 @@ public:
ScMyAddress(SCCOL nColP, SCROW nRowP, SCTAB nTabP) : ScAddress(nColP, nRowP, nTabP) {}
ScMyAddress(const ScAddress& rAddress) : ScAddress(rAddress) {}
- sal_Bool operator< ( const ScMyAddress& rAddress ) const
+ bool operator< ( const ScMyAddress& rAddress ) const
{
if( Row() != rAddress.Row() )
return (Row() < rAddress.Row());
@@ -88,7 +88,7 @@ public:
virtual void SAL_CALL disposing();
- void CompleteSelectionChanged(sal_Bool bNewState);
+ void CompleteSelectionChanged(bool bNewState);
virtual void LostFocus();
virtual void GotFocus();
@@ -274,21 +274,21 @@ private:
ScSplitPos meSplitPos;
ScAddress maActiveCell;
SCTAB mnTab;
- sal_Bool mbIsSpreadsheet;
- sal_Bool mbHasSelection;
- sal_Bool mbDelIns;
- sal_Bool mbIsFocusSend;
+ bool mbIsSpreadsheet;
+ bool mbHasSelection;
+ bool mbDelIns;
+ bool mbIsFocusSend;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- sal_Bool IsEditable(
+ bool IsEditable(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- sal_Bool IsFocused();
- sal_Bool IsCompleteSheetSelected();
+ bool IsFocused();
+ bool IsCompleteSheetSelected();
- void SelectCell(sal_Int32 nRow, sal_Int32 nCol, sal_Bool bDeselect);
+ void SelectCell(sal_Int32 nRow, sal_Int32 nCol, bool bDeselect);
void CreateSortedMarkedCells();
void AddMarkedRange(const ScRange& rRange);
@@ -301,45 +301,47 @@ private:
MAP_ADDR_XACC;
MAP_ADDR_XACC m_mapSelectionSend;
void RemoveSelection(ScMarkData &refScMarkData);
- sal_Bool IsSameMarkCell();
+ bool IsSameMarkCell();
void CommitFocusCell(const ScAddress &aNewCell);
public:
void FireFirstCellFocus();
private:
- sal_Bool m_bFormulaMode;
- sal_Bool m_bFormulaLastMode;
- ScAddress m_aFormulaActiveCell;
+ bool m_bFormulaMode;
+ bool m_bFormulaLastMode;
+ ScAddress m_aFormulaActiveCell;
MAP_ADDR_XACC m_mapFormulaSelectionSend;
- VEC_MYADDR m_vecFormulaLastMyAddr;
+ VEC_MYADDR m_vecFormulaLastMyAddr;
rtl::Reference<ScAccessibleCell> m_pAccFormulaCell;
- sal_uInt16 m_nMinX;
- sal_uInt16 m_nMaxX;
- sal_Int32 m_nMinY;
- sal_Int32 m_nMaxY;
+ sal_uInt16 m_nMinX;
+ sal_uInt16 m_nMaxX;
+ sal_Int32 m_nMinY;
+ sal_Int32 m_nMaxY;
+
sal_Int32 GetRowAll() const { return m_nMaxY - m_nMinY + 1 ; }
sal_uInt16 GetColAll() const { return m_nMaxX - m_nMinX + 1; }
void NotifyRefMode();
- void RemoveFormulaSelection(sal_Bool bRemoveAll =sal_False);
- sal_Bool CheckChildIndex(sal_Int32)const ;
+ void RemoveFormulaSelection(bool bRemoveAll = false);
+ bool CheckChildIndex(sal_Int32) const;
ScAddress GetChildIndexAddress(sal_Int32) const;
sal_Int32 GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn );
- sal_Bool GetFormulaCurrentFocusCell(ScAddress &addr);
+ bool GetFormulaCurrentFocusCell(ScAddress &addr);
public:
- sal_Bool IsScAddrFormulaSel (const ScAddress &addr) const ;
- sal_Bool IsFormulaMode() ;
- ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > GetActiveCell();
- ScRange m_aLastWithInMarkRange;
- OUString m_strCurCellValue;
- ScRangeList m_LastMarkedRanges;
+ ScRange m_aLastWithInMarkRange;
+ OUString m_strCurCellValue;
+ ScRangeList m_LastMarkedRanges;
typedef std::vector<ScRange*> VEC_RANGE;
- VEC_RANGE m_vecTempRange;
+ VEC_RANGE m_vecTempRange;
typedef std::pair<sal_uInt16,sal_uInt16> PAIR_COL;
typedef std::vector<PAIR_COL> VEC_COL;
- VEC_COL m_vecTempCol;
+ VEC_COL m_vecTempCol;
+ OUString m_strOldTabName;
+
+ ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > GetActiveCell();
+ bool IsScAddrFormulaSel (const ScAddress &addr) const;
+ bool IsFormulaMode();
ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex);
- sal_Bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize);
- sal_Bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet);
- OUString m_strOldTabName;
+ bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize);
+ bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet);
};
#endif
commit 08e1cfecb51ae81a79dfb43ec5c40555899581db
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:45:00 2014 +0200
sal_Bool->bool
Change-Id: I4cebd15a8bae319becabf1b69d650d5b3dc6718f
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index e75040a..e64807c 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -674,7 +674,7 @@ Rectangle ScAccessiblePreviewTable::GetBoundingBox() const
return aRect;
}
-sal_Bool ScAccessiblePreviewTable::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
+bool ScAccessiblePreviewTable::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
{
return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index 2a1def5..55dc60c 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -184,7 +184,7 @@ private:
sal_Int32 mnIndex;
mutable ScPreviewTableInfo* mpTableInfo;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
commit 5f0878472cef1024cd726bc64dfb90b872ad48a8
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:43:38 2014 +0200
sal_bool->bool
Change-Id: I684b6243ad87f9941e9f2147c2eee6f975cb8179
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 42dd8e2..6ec1a62 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star::accessibility;
ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
ScPreviewShell* pViewShell,
- const ScAddress& rCellPos, sal_Bool bIsColHdr, sal_Bool bIsRowHdr,
+ const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr,
sal_Int32 nIndex ) :
ScAccessibleContextBase( rxParent, AccessibleRole::TABLE_CELL ),
mpViewShell( pViewShell ),
@@ -417,7 +417,7 @@ OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(un
return sName;
}
-sal_Bool ScAccessiblePreviewHeaderCell::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
+bool ScAccessiblePreviewHeaderCell::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
{
return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
index 4bcf6c0..ff86dda 100644
--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
@@ -45,7 +45,7 @@ public:
ScAccessiblePreviewHeaderCell( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
ScPreviewShell* pViewShell,
- const ScAddress& rCellPos, sal_Bool bIsColHdr, sal_Bool bIsRowHdr,
+ const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr,
sal_Int32 nIndex );
protected:
@@ -128,11 +128,11 @@ private:
accessibility::AccessibleTextHelper* mpTextHelper;
sal_Int32 mnIndex;
ScAddress maCellPos;
- sal_Bool mbColumnHeader;
- sal_Bool mbRowHeader;
+ bool mbColumnHeader;
+ bool mbRowHeader;
mutable ScPreviewTableInfo* mpTableInfo;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
commit 6c9aca77637365426cbc7153a73284fbc1821ba4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:41:58 2014 +0200
sal_Bool->bool
Change-Id: I138508cae0e342f7b259607ffb0403d985103326
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 921272c..75ea2ac 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -252,7 +252,7 @@ Rectangle ScAccessiblePreviewCell::GetBoundingBox() const throw (uno::RuntimeExc
return aCellRect;
}
-sal_Bool ScAccessiblePreviewCell::IsDefunc(
+bool ScAccessiblePreviewCell::IsDefunc(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
return ScAccessibleContextBase::IsDefunc() || (mpDoc == NULL) || (mpViewShell == NULL) || !getAccessibleParent().is() ||
@@ -265,13 +265,13 @@ bool ScAccessiblePreviewCell::IsEditable(
return false;
}
-sal_Bool ScAccessiblePreviewCell::IsOpaque(
+bool ScAccessiblePreviewCell::IsOpaque(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
// test whether there is a background color
//! could be moved to ScAccessibleCellBase
- sal_Bool bOpaque(sal_True);
+ bool bOpaque(true);
if (mpDoc)
{
const SvxBrushItem* pItem = (const SvxBrushItem*)mpDoc->GetAttr(
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index a1a3418..f425e3c 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -95,13 +95,13 @@ private:
accessibility::AccessibleTextHelper* mpTextHelper;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
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);
commit 58c957e39bf96c97415555d645996ede8c3ecc1b
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:40:36 2014 +0200
sal_Bool->bool
Change-Id: Iac3d82294985ed1689b7f4c267b6311caddd50a5
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 6f6cf3b..0b2d10b 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -47,7 +47,7 @@ ScAccessiblePageHeaderArea::ScAccessiblePageHeaderArea(
const uno::Reference<XAccessible>& rxParent,
ScPreviewShell* pViewShell,
const EditTextObject* pEditObj,
- sal_Bool bHeader,
+ bool bHeader,
SvxAdjust eAdjust)
: ScAccessibleContextBase(rxParent, AccessibleRole::TEXT),
mpEditObj(pEditObj->Clone()),
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index 6031c7d..548101b 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -41,7 +41,7 @@ public:
::com::sun::star::accessibility::XAccessible>& rxParent,
ScPreviewShell* pViewShell,
const EditTextObject* pEditObj,
- sal_Bool bHeader,
+ bool bHeader,
SvxAdjust eAdjust);
protected:
virtual ~ScAccessiblePageHeaderArea (void);
@@ -117,8 +117,8 @@ private:
EditTextObject* mpEditObj;
accessibility::AccessibleTextHelper* mpTextHelper;
ScPreviewShell* mpViewShell;
- sal_Bool mbHeader;
- SvxAdjust meAdjust;
+ bool mbHeader;
+ SvxAdjust meAdjust;
void CreateTextHelper();
};
commit 8e01acba6d5277036ee5cf710e24402674e60689
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:34:58 2014 +0200
sal_Bool->bool
Change-Id: I8d085a23ed47430bbe87b9c79c33a293b1a49eda
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 8ae6a74..8083bfc 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1441,7 +1441,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
if (!mpHeader)
{
- mpHeader = new ScAccessiblePageHeader( this, mpViewShell, sal_True, aCount.nBackShapes + aCount.nHeaders - 1);
+ mpHeader = new ScAccessiblePageHeader( this, mpViewShell, true, aCount.nBackShapes + aCount.nHeaders - 1);
mpHeader->acquire();
}
if (!mpFooter)
@@ -1519,7 +1519,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
{
if ( !mpHeader )
{
- mpHeader = new ScAccessiblePageHeader( this, mpViewShell, sal_True, nIndex );
+ mpHeader = new ScAccessiblePageHeader( this, mpViewShell, true, nIndex );
mpHeader->acquire();
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 3a777c4..d49469d 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -85,7 +85,7 @@ struct Dispose
ScAccessiblePageHeader::ScAccessiblePageHeader( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
- ScPreviewShell* pViewShell, sal_Bool bHeader, sal_Int32 nIndex ) :
+ ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex ) :
ScAccessibleContextBase( rxParent, bHeader ? AccessibleRole::HEADER : AccessibleRole::FOOTER ),
mpViewShell( pViewShell ),
mnIndex( nIndex ),
@@ -389,7 +389,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce
return aRect;
}
-sal_Bool ScAccessiblePageHeader::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
+bool ScAccessiblePageHeader::IsDefunc( const uno::Reference<XAccessibleStateSet>& rxParentStates )
{
return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx
index 1bf13a5..c67bf7f 100644
--- a/sc/source/ui/inc/AccessiblePageHeader.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeader.hxx
@@ -34,7 +34,7 @@ class ScAccessiblePageHeader : public ScAccessibleContextBase
public:
ScAccessiblePageHeader( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
- ScPreviewShell* pViewShell, sal_Bool bHeader, sal_Int32 nIndex );
+ ScPreviewShell* pViewShell, bool bHeader, sal_Int32 nIndex );
protected:
virtual ~ScAccessiblePageHeader();
@@ -87,12 +87,12 @@ protected:
private:
ScPreviewShell* mpViewShell;
sal_Int32 mnIndex;
- sal_Bool mbHeader;
+ bool mbHeader;
typedef std::vector< ScAccessiblePageHeaderArea* > ScHFAreas;
ScHFAreas maAreas;
sal_Int32 mnChildCount;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
commit a69db1b69a203e7a8ce256425266d0e343a78f3f
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:32:41 2014 +0200
sal_Bool->bool
Change-Id: I1a48bffcf32f3224fe2daa0ec04f2847d7b2285c
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index a45c9c5..ea6ee79 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -114,7 +114,7 @@ void ScAccessibleEditObject::LostFocus()
void ScAccessibleEditObject::GotFocus()
{
- mbHasFocus = sal_True;
+ mbHasFocus = true;
CommitFocusGained();
if (mpTextHelper)
mpTextHelper->SetFocus(sal_True);
@@ -346,7 +346,7 @@ uno::Sequence<sal_Int8> SAL_CALL
//==== internal =========================================================
-sal_Bool ScAccessibleEditObject::IsDefunc(
+bool ScAccessibleEditObject::IsDefunc(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
return ScAccessibleContextBase::IsDefunc() || !getAccessibleParent().is() ||
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index c0c7474..93e57cc 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -188,12 +188,12 @@ public:
private:
accessibility::AccessibleTextHelper* mpTextHelper;
- EditView* mpEditView;
- Window* mpWindow;
+ EditView* mpEditView;
+ Window* mpWindow;
EditObjectType meObjectType;
- sal_Bool mbHasFocus;
+ bool mbHasFocus;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
commit 691279934c94e979b923b6a096c39b0f7678b182
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:30:58 2014 +0200
sal_Bool->bool
Change-Id: Ibd3f0c537cd351990ea8f57c33df2b6a688ce3a8
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 4b90eaa..8ae6a74 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1665,7 +1665,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::Ru
return aRect;
}
-sal_Bool ScAccessibleDocumentPagePreview::IsDefunc(
+bool ScAccessibleDocumentPagePreview::IsDefunc(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
return ScAccessibleContextBase::IsDefunc() || !getAccessibleParent().is() ||
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 474f223..93231c4 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -136,7 +136,7 @@ private:
ScAccessiblePageHeader* mpHeader;
ScAccessiblePageHeader* mpFooter;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
commit f30f646e1e132fb3e5019669657ebc1a33ccb1fc
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:29:17 2014 +0200
sal_Bool->bool
Change-Id: Ib0f6699e994f5a71603779b8227bf081b71a5dd6
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index d5570ad..ff0b683 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -40,9 +40,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
// ________ IAccessibleViewforwarder ________
-sal_Bool AccessibleViewForwarder::IsValid() const
+bool AccessibleViewForwarder::IsValid() const
{
- return sal_True;
+ return true;
}
Rectangle AccessibleViewForwarder::GetVisibleArea() const
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index 14524e2..694e40d 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -36,7 +36,7 @@ public:
virtual ~AccessibleViewForwarder();
// ________ IAccessibleViewforwarder ________
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisibleArea() const;
virtual Point LogicToPixel( const Point& rPoint ) const;
virtual Size LogicToPixel( const Size& rSize ) const;
diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index f3e6165..cbf9f87 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -60,7 +60,7 @@ public:
@return
Return <true/> if the view forwarder is valid and <false/> else.
*/
- virtual sal_Bool IsValid (void) const = 0;
+ virtual bool IsValid (void) const = 0;
/** Returns the area of the underlying document that is visible in the
* corresponding window.
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index fc2a0ca..eaaf6f7 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1496,7 +1496,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve
Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() );
if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() )
{
- AddChild( pChildWin->GetAccessible(), sal_True );
+ AddChild( pChildWin->GetAccessible(), true );
}
}
break;
@@ -1505,7 +1505,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve
Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() );
if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() )
{
- RemoveChild( pChildWin->GetAccessible(), sal_True );
+ RemoveChild( pChildWin->GetAccessible(), true );
}
}
break;
@@ -1605,7 +1605,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::CellInEditMode);
uno::Reference<XAccessible> xAcc = mpTempAccEdit;
- AddChild(xAcc, sal_True);
+ AddChild(xAcc, true);
if (mpAccessibleSpreadsheet)
mpAccessibleSpreadsheet->LostFocus();
@@ -1624,7 +1624,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
mpTempAccEdit->LostFocus();
mpTempAccEdit = NULL;
- RemoveChild(mxTempAcc, sal_True);
+ RemoveChild(mxTempAcc, true);
if (mpAccessibleSpreadsheet && mpViewShell->IsActive())
mpAccessibleSpreadsheet->GotFocus();
else if( mpViewShell->IsActive())
@@ -1668,7 +1668,7 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& /
sal_Bool bSelectionChanged(false);
if (mpAccessibleSpreadsheet)
{
- sal_Bool bOldSelected(mbCompleteSheetSelected);
+ bool bOldSelected(mbCompleteSheetSelected);
mbCompleteSheetSelected = IsTableSelected();
if (bOldSelected != mbCompleteSheetSelected)
{
@@ -2112,7 +2112,7 @@ uno::Sequence<sal_Int8> SAL_CALL
///===== IAccessibleViewForwarder ========================================
-sal_Bool ScAccessibleDocument::IsValid (void) const
+bool ScAccessibleDocument::IsValid (void) const
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -2280,9 +2280,9 @@ void ScAccessibleDocument::FreeAccessibleSpreadsheet()
}
}
-sal_Bool ScAccessibleDocument::IsTableSelected() const
+bool ScAccessibleDocument::IsTableSelected() const
{
- sal_Bool bResult (false);
+ bool bResult (false);
if(mpViewShell)
{
SCTAB nTab(getVisibleTable());
@@ -2290,26 +2290,26 @@ sal_Bool ScAccessibleDocument::IsTableSelected() const
ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData());
aMarkData.MarkToMulti();
if (aMarkData.IsAllMarked(ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab))))
- bResult = sal_True;
+ bResult = true;
}
return bResult;
}
-sal_Bool ScAccessibleDocument::IsDefunc(
+bool ScAccessibleDocument::IsDefunc(
const uno::Reference<XAccessibleStateSet>& rxParentStates)
{
return ScAccessibleContextBase::IsDefunc() || (mpViewShell == NULL) || !getAccessibleParent().is() ||
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
}
-sal_Bool ScAccessibleDocument::IsEditable(
+bool ScAccessibleDocument::IsEditable(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
// what is with document protection or readonly documents?
- return sal_True;
+ return true;
}
-void ScAccessibleDocument::AddChild(const uno::Reference<XAccessible>& xAcc, sal_Bool bFireEvent)
+void ScAccessibleDocument::AddChild(const uno::Reference<XAccessible>& xAcc, bool bFireEvent)
{
OSL_ENSURE(!mxTempAcc.is(), "this object should be removed before");
if (xAcc.is())
@@ -2326,7 +2326,7 @@ void ScAccessibleDocument::AddChild(const uno::Reference<XAccessible>& xAcc, sal
}
}
-void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc, sal_Bool bFireEvent)
+void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc, bool bFireEvent)
{
OSL_ENSURE(mxTempAcc.is(), "this object should be added before");
if (xAcc.is())
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 305ce15..4b90eaa 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -512,7 +512,7 @@ public:
///===== IAccessibleViewForwarder ========================================
- virtual sal_Bool IsValid (void) const;
+ virtual bool IsValid (void) const;
virtual Rectangle GetVisibleArea() const;
virtual Point LogicToPixel (const Point& rPoint) const;
virtual Size LogicToPixel (const Size& rSize) const;
@@ -547,7 +547,7 @@ ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder()
///===== IAccessibleViewForwarder ========================================
-sal_Bool ScIAccessibleViewForwarder::IsValid (void) const
+bool ScIAccessibleViewForwarder::IsValid (void) const
{
SolarMutexGuard aGuard;
return mbValid;
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 46441a6..7f96300 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -204,7 +204,7 @@ public:
@return
Return <true/> if the view forwarder is valid and <false/> else.
*/
- virtual sal_Bool IsValid (void) const;
+ virtual bool IsValid (void) const;
/** Returns the area of the underlying document that is visible in the
* corresponding window.
@@ -296,7 +296,7 @@ private:
ScAccessibleEditObject* mpTempAccEdit;
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> mxTempAcc;
Rectangle maVisArea;
- sal_Bool mbCompleteSheetSelected;
+ bool mbCompleteSheetSelected;
public:
SCTAB getVisibleTable() const; // use it in ScChildrenShapes
@@ -304,17 +304,17 @@ public:
private:
void FreeAccessibleSpreadsheet();
- sal_Bool IsTableSelected() const;
+ bool IsTableSelected() const;
- sal_Bool IsDefunc(
+ bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- sal_Bool IsEditable(
+ bool IsEditable(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, sal_Bool bFireEvent);
- void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, sal_Bool bFireEvent);
+ void AddChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent);
+ void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent);
OUString GetCurrentCellName() const;
OUString GetCurrentCellDescription() const;
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 2b7dd53..b4a2815 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -62,9 +62,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder (void)
-sal_Bool AccessibleViewForwarder::IsValid (void) const
+bool AccessibleViewForwarder::IsValid (void) const
{
- return sal_True;
+ return true;
}
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 6a2c8ca..45ee9d1 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -57,7 +57,7 @@ public:
@return
Return <true/> if the view forwarder is valid and <false/> else.
*/
- virtual sal_Bool IsValid (void) const;
+ virtual bool IsValid (void) const;
/** Returns the area of the underlying document that is visible in the
* corresponding window.
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 0b230a6..7b94a73 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -898,9 +898,9 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi
//===== IAccessibleViewforwarder ========================================
-sal_Bool SvxGraphCtrlAccessibleContext::IsValid (void) const
+bool SvxGraphCtrlAccessibleContext::IsValid (void) const
{
- return sal_True;
+ return true;
}
//-----------------------------------------------------------------------------
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index c1f7b94..8619254 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -166,7 +166,7 @@ public:
//===== IAccessibleViewforwarder ========================================
- virtual sal_Bool IsValid (void) const;
+ virtual bool IsValid (void) const;
virtual Rectangle GetVisibleArea() const;
virtual Point LogicToPixel (const Point& rPoint) const;
virtual Size LogicToPixel (const Size& rSize) const;
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 0329cf7..13a609a 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -264,7 +264,7 @@ public:
// IAccessibleViewForwarder
- virtual sal_Bool IsValid() const;
+ virtual bool IsValid() const;
virtual Rectangle GetVisibleArea() const;
virtual Point LogicToPixel (const Point& rPoint) const;
virtual Size LogicToPixel (const Size& rSize) const;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 99a43f2..0b40ef6 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3137,9 +3137,9 @@ void SwAccessibleMap::FireEvents()
}
-sal_Bool SwAccessibleMap::IsValid() const
+bool SwAccessibleMap::IsValid() const
{
- return sal_True;
+ return true;
}
Rectangle SwAccessibleMap::GetVisibleArea() const
commit 27042facc6e2c21be630c709d4818962db63352d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:11:04 2014 +0200
sal_Bool->bool
Change-Id: I927e6253a5aaed8b9ecb1481fb5125dc223012d9
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 8c6daa8..5f5a3db 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -295,7 +295,7 @@ protected:
/// Calls all FocusListener to tell they that the focus is lost.
void CommitFocusLost() const;
- sal_Bool IsDefunc() const { return rBHelper.bDisposed; }
+ bool IsDefunc() const { return rBHelper.bDisposed; }
virtual void IsObjectValid() const
throw (::com::sun::star::lang::DisposedException);
commit 0db5358ba93a7c7a18d9c09d2476f54d7ddc5ab9
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:08:48 2014 +0200
sal_Bool->bool
Change-Id: I3170a2bb1fb9be3584828929a14b4b49eb81b1d7
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 2b0d329..6afdaf8 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -149,7 +149,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
public:
const ScAddress& GetCellAddress() const { return maCellAddress; }
- sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
+ bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
};
commit 0950700bea414cacec8b81cd457adf7cdbdb8deb
Author: Noel Grandin <noel at peralex.com>
Date: Thu Feb 13 14:07:10 2014 +0200
sal_Bool->bool
Change-Id: I49b58a10fc89868aa5406d62eec3f2bc7186611c
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 454503c..8691ac6 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 ccabfbc..b1a8ed8 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 d294134..921272c 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 9ad298b..c8ef527 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();
};
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list