sc/inc/cellsuno.hxx | 10 ++--
sc/inc/chart2uno.hxx | 4 -
sc/inc/chartpos.hxx | 4 -
sc/inc/chgviset.hxx | 58 +++++++++++++--------------
sc/inc/consoli.hxx | 14 +++---
sc/inc/convuno.hxx | 8 +--
sc/inc/dapiuno.hxx | 12 ++---
sc/inc/dbdata.hxx | 4 -
sc/source/core/tool/chartpos.cxx | 2
sc/source/core/tool/chgviset.cxx | 2
sc/source/core/tool/consoli.cxx | 23 ++++------
sc/source/core/tool/dbdata.cxx | 4 -
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/docshell/docsh.cxx | 6 +-
sc/source/ui/docshell/docsh3.cxx | 10 ++--
sc/source/ui/docshell/docsh4.cxx | 8 +--
sc/source/ui/unoobj/cellsuno.cxx | 16 +++----
sc/source/ui/unoobj/chart2uno.cxx | 4 -
sc/source/ui/unoobj/dapiuno.cxx | 14 +++---
20 files changed, 102 insertions(+), 105 deletions(-)
New commits:
commit 6fd75d6a34e1a696a766776326f589b471b84d82
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 17:02:10 2014 +0200
sal_Bool->bool
Change-Id: Iba99495f93edc1bbd8b4fbdbf25c6c6f8b8986be
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index c9ecdfb..78525b7 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -225,8 +225,8 @@ public:
AnonDBs& getAnonDBs();
const AnonDBs& getAnonDBs() const;
- const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool
bStartOnly) const;
- ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool
bStartOnly);
+ const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly) const;
+ ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool
bStartOnly);
const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 5eb88b3..e8f171f 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -822,7 +822,7 @@ const ScDBCollection::AnonDBs& ScDBCollection::getAnonDBs()
const
return maAnonDBs;
}
-const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB
nTab, sal_Bool bStartOnly) const
+const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB
nTab, bool bStartOnly) const
{
// First, search the global named db ranges.
NamedDBs::DBsType::const_iterator itr = find_if(
@@ -844,7 +844,7 @@ const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol,
SCROW nRow, SCTAB nTab
return NULL;
}
-ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
sal_Bool bStartOnly)
+ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
bool bStartOnly)
{
// First, search the global named db ranges.
NamedDBs::DBsType::iterator itr = find_if(
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 796ede7..76625d0 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -213,7 +213,7 @@ void ScDbNameDlg::Init()
if ( pDBColl )
{
// Feststellen, ob definierter DB-Bereich markiert wurde:
- pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab,
sal_True );
+ pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab,
true );
if ( pDBData )
{
ScAddress& rStart = theCurArea.aStart;
commit b132bf92ccdbcd81f25fdb11b9f2a6e9297092f1
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 16:39:30 2014 +0200
sal_Bool->bool
Change-Id: Ibc8696d41afead254c832afb7b4aeed73f52cab9
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 8edab4c..8fd2a23 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -568,8 +568,8 @@ public:
void setSubtotals(const com::sun::star::uno::Sequence<
com::sun::star::sheet::GeneralFunction >& rFunctions);
OUString getCurrentPage() const;
void setCurrentPage(const OUString& sPage);
- sal_Bool getUseCurrentPage() const;
- void setUseCurrentPage(sal_Bool bUse);
+ bool getUseCurrentPage() const;
+ void setUseCurrentPage(bool bUse);
const com::sun::star::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo();
void setAutoShowInfo(const
com::sun::star::sheet::DataPilotFieldAutoShowInfo* pInfo);
const com::sun::star::sheet::DataPilotFieldLayoutInfo* getLayoutInfo();
@@ -578,15 +578,15 @@ public:
void setReference(const com::sun::star::sheet::DataPilotFieldReference*
pInfo);
const com::sun::star::sheet::DataPilotFieldSortInfo* getSortInfo();
void setSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo*
pInfo);
- sal_Bool getShowEmpty() const;
- void setShowEmpty(sal_Bool bShow);
+ bool getShowEmpty() const;
+ void setShowEmpty(bool bShow);
- sal_Bool hasGroupInfo();
+ bool hasGroupInfo();
com::sun::star::sheet::DataPilotFieldGroupInfo getGroupInfo();
void setGroupInfo(const com::sun::star::sheet::DataPilotFieldGroupInfo*
pInfo);
// XDataPilotFieldGrouping
- sal_Bool HasString(const com::sun::star::uno::Sequence< OUString >&
aItems, const OUString& aString);
+ bool HasString(const com::sun::star::uno::Sequence< OUString >& aItems,
const OUString& aString);
virtual com::sun::star::uno::Reference <
com::sun::star::sheet::XDataPilotField > SAL_CALL
createNameGroup(const com::sun::star::uno::Sequence< OUString >&
aItems)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 5d8508a..8913cef 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -2245,12 +2245,12 @@ void ScDataPilotFieldObj::setCurrentPage( const
OUString& rPage )
}
}
-sal_Bool ScDataPilotFieldObj::getUseCurrentPage() const
+bool ScDataPilotFieldObj::getUseCurrentPage() const
{
return false;
}
-void ScDataPilotFieldObj::setUseCurrentPage( sal_Bool bUse )
+void ScDataPilotFieldObj::setUseCurrentPage( bool bUse )
{
SolarMutexGuard aGuard;
ScDPObject* pDPObj = 0;
@@ -2341,14 +2341,14 @@ void ScDataPilotFieldObj::setSortInfo( const
DataPilotFieldSortInfo* pInfo )
}
}
-sal_Bool ScDataPilotFieldObj::getShowEmpty() const
+bool ScDataPilotFieldObj::getShowEmpty() const
{
SolarMutexGuard aGuard;
ScDPSaveDimension* pDim = GetDPDimension();
return pDim && pDim->GetShowEmpty();
}
-void ScDataPilotFieldObj::setShowEmpty( sal_Bool bShow )
+void ScDataPilotFieldObj::setShowEmpty( bool bShow )
{
SolarMutexGuard aGuard;
ScDPObject* pDPObj = 0;
@@ -2359,7 +2359,7 @@ void ScDataPilotFieldObj::setShowEmpty( sal_Bool bShow )
}
}
-sal_Bool ScDataPilotFieldObj::hasGroupInfo()
+bool ScDataPilotFieldObj::hasGroupInfo()
{
SolarMutexGuard aGuard;
ScDPObject* pDPObj = 0;
@@ -2522,9 +2522,9 @@ void ScDataPilotFieldObj::setGroupInfo( const
DataPilotFieldGroupInfo* pInfo )
}
}
-sal_Bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems,
const OUString& aString)
+bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems, const
OUString& aString)
{
- sal_Bool bRet = false;
+ bool bRet = false;
sal_Int32 nCount(rItems.getLength());
sal_Int32 nItem(0);
commit 18d0f4c714e71b3ebdd697a3759a74a20a25344f
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 16:13:23 2014 +0200
sal_Bool->bool
Change-Id: Idfdfc19ac80797ef7185425c7929db3fc2e9e1a5
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index b30067b..62fc803 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -166,7 +166,7 @@ inline bool ScUnoConversion::Contains(
(rApiOuter.StartRow <= rApiInner.StartRow) && (rApiInner.EndRow <=
rApiOuter.EndRow);
}
-inline sal_Bool operator==(
+inline bool operator==(
const ::com::sun::star::table::CellAddress& rApiAddress1,
const ::com::sun::star::table::CellAddress& rApiAddress2 )
{
@@ -176,14 +176,14 @@ inline sal_Bool operator==(
(rApiAddress1.Sheet == rApiAddress2.Sheet);
}
-inline sal_Bool operator!=(
+inline bool operator!=(
const ::com::sun::star::table::CellAddress& rApiAddress1,
const ::com::sun::star::table::CellAddress& rApiAddress2 )
{
return !(rApiAddress1 == rApiAddress2);
}
-inline sal_Bool operator==(
+inline bool operator==(
const ::com::sun::star::table::CellRangeAddress& rApiRange1,
const ::com::sun::star::table::CellRangeAddress& rApiRange2 )
{
@@ -195,7 +195,7 @@ inline sal_Bool operator==(
(rApiRange1.Sheet == rApiRange2.Sheet);
}
-inline sal_Bool operator!=(
+inline bool operator!=(
const ::com::sun::star::table::CellRangeAddress& rApiRange1,
const ::com::sun::star::table::CellRangeAddress& rApiRange2 )
{
commit 3dffe225845a4f1646684ca2e688c5275993d2f7
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 15:45:56 2014 +0200
sal_Bool->bool and remove unnecessary param on ScConsData::InitData
since it was only called from one place, and that place
unconditionally passed "false"
Change-Id: I1b730cfff23da08a86d385737043fcabf16d37cb
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 9ae5060..6bef102 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -70,12 +70,12 @@ class ScConsData
{
private:
ScSubTotalFunc eFunction;
- sal_Bool bReference;
- sal_Bool bColByName;
- sal_Bool bRowByName;
+ bool bReference;
+ bool bColByName;
+ bool bRowByName;
SCSIZE nColCount;
SCSIZE nRowCount;
- sal_Bool** ppUsed;
+ bool** ppUsed;
double** ppSum;
double** ppCount;
double** ppSumSqr;
@@ -86,7 +86,7 @@ private:
SCSIZE nTitleCount;
OUString* mpTitles;
SCSIZE** ppTitlePos;
- sal_Bool bCornerUsed;
+ bool bCornerUsed;
OUString aCornerText; // only for bColByName &&
bRowByName
public:
@@ -94,9 +94,9 @@ public:
~ScConsData();
void SetSize( SCCOL nCols, SCROW nRows );
- void SetFlags( ScSubTotalFunc eFunc, sal_Bool bColName, sal_Bool
bRowName, sal_Bool bRef );
+ void SetFlags( ScSubTotalFunc eFunc, bool bColName, bool bRowName,
bool bRef );
- void InitData(sal_Bool bDelete=sal_True);
+ void InitData();
void DeleteData();
void AddFields( ScDocument* pSrcDoc, SCTAB nTab,
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 3dbe8f9..71792e6 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -159,11 +159,8 @@ void ScConsData::DeleteData()
#undef DELETEARR
#undef DELETESTR
-void ScConsData::InitData( sal_Bool bDelete )
+void ScConsData::InitData()
{
- if (bDelete)
- DeleteData();
-
if (bReference && nColCount && !ppRefs)
{
ppRefs = new ScReferenceList*[nColCount];
@@ -185,11 +182,11 @@ void ScConsData::InitData( sal_Bool bDelete )
if (nColCount && !ppUsed)
{
- ppUsed = new sal_Bool*[nColCount];
+ ppUsed = new bool*[nColCount];
for (SCSIZE i=0; i<nColCount; i++)
{
- ppUsed[i] = new sal_Bool[nRowCount];
- memset( ppUsed[i], 0, nRowCount * sizeof(sal_Bool) );
+ ppUsed[i] = new bool[nRowCount];
+ memset( ppUsed[i], 0, nRowCount * sizeof(bool) );
}
}
@@ -208,7 +205,7 @@ void ScConsData::InitData( sal_Bool bDelete )
void ScConsData::DoneFields()
{
- InitData(false);
+ InitData();
}
void ScConsData::SetSize( SCCOL nCols, SCROW nRows )
@@ -224,7 +221,7 @@ void ScConsData::GetSize( SCCOL& rCols, SCROW& rRows ) const
rRows = static_cast<SCROW>(nRowCount);
}
-void ScConsData::SetFlags( ScSubTotalFunc eFunc, sal_Bool bColName, sal_Bool
bRowName, sal_Bool bRef )
+void ScConsData::SetFlags( ScSubTotalFunc eFunc, bool bColName, bool bRowName,
bool bRef )
{
DeleteData();
bReference = bRef;
@@ -304,7 +301,7 @@ void ScConsData::AddName( const OUString& rName )
{
if (!ppUsed[nArrX][nArrY])
{
- ppUsed[nArrX][nArrY] = sal_True;
+ ppUsed[nArrX][nArrY] = true;
ppRefs[nArrX][nArrY].Init();
}
ppRefs[nArrX][nArrY].SetFullSize(nMax);
@@ -504,7 +501,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
else
{
aCornerText = aThisCorner;
- bCornerUsed = sal_True;
+ bCornerUsed = true;
}
}
@@ -585,7 +582,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
ppRefs[nArrX][nArrY].AddEntry( nCol, nRow, nTab );
else
{
- ppUsed[nArrX][nArrY] = sal_True;
+ ppUsed[nArrX][nArrY] = true;
ppRefs[nArrX][nArrY].Init();
ppRefs[nArrX][nArrY].AddEntry( nCol, nRow, nTab );
}
@@ -600,7 +597,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
nVal);
else
{
- ppUsed[nArrX][nArrY] = sal_True;
+ ppUsed[nArrX][nArrY] = true;
lcl_InitArray( eFunction, ppCount[nArrX][nArrY],
ppSum[nArrX][nArrY],
ppSumSqr[nArrX][nArrY], nVal
);
commit a2c49ef9105edb8b136cd138ff0fb13a9bf78947
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 15:27:14 2014 +0200
sal_Bool->bool
Change-Id: I6f567871d9ba0517c5069f9b2d6c908b4501178d
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 276b2da..d947e27 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -58,7 +58,7 @@ public:
SCCOL GetColCount() const { return nColCount; }
SCROW GetRowCount() const { return nRowCount; }
- sal_Bool IsValid( SCCOL nCol, SCROW nRow ) const
+ bool IsValid( SCCOL nCol, SCROW nRow ) const
{ return nCol < nColCount && nRow <
nRowCount; }
// data column by column
sal_uLong GetIndex( SCCOL nCol, SCROW nRow ) const
@@ -140,7 +140,7 @@ public:
void SetStartCol(SCCOL nNew) { nStartCol = nNew; }
void SetStartRow(SCROW nNew) { nStartRow = nNew; }
- sal_Bool operator==(const ScChartPositioner& rCmp) const;
+ bool operator==(const ScChartPositioner& rCmp) const;
void InvalidateGlue()
{
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index af15c2f..72ce90a 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -86,7 +86,7 @@ ScChartPositioner::~ScChartPositioner()
delete pPositionMap;
}
-sal_Bool ScChartPositioner::operator==(const ScChartPositioner& rCmp) const
+bool ScChartPositioner::operator==(const ScChartPositioner& rCmp) const
{
return bColHeaders == rCmp.bColHeaders
&& bRowHeaders == rCmp.bRowHeaders
commit 1d7f9ceb1c3e7d3bdf9d074a034808dc3b8fbb9b
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 15:10:45 2014 +0200
sal_Bool->bool
Change-Id: Ia39a8e928b68d4e05696e9a664fad28f95b91828
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index 565225a..8a379d4 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -40,18 +40,18 @@ private:
utl::TextSearch* pCommentSearcher;
DateTime aFirstDateTime;
DateTime aLastDateTime;
- OUString aAuthorToShow;
- OUString aComment;
+ OUString aAuthorToShow;
+ OUString aComment;
ScRangeList aRangeList;
ScChgsDateMode eDateMode;
- sal_Bool bShowIt;
- sal_Bool bIsDate;
- sal_Bool bIsAuthor;
- sal_Bool bIsComment;
- sal_Bool bIsRange;
- sal_Bool bEveryoneButMe;
- sal_Bool bShowAccepted;
- sal_Bool bShowRejected;
+ bool bShowIt;
+ bool bIsDate;
+ bool bIsAuthor;
+ bool bIsComment;
+ bool bIsRange;
+ bool bEveryoneButMe;
+ bool bShowAccepted;
+ bool bShowRejected;
bool mbIsActionRange;
sal_uLong mnFirstAction;
sal_uLong mnLastAction;
@@ -79,11 +79,11 @@ public:
~ScChangeViewSettings();
- sal_Bool ShowChanges() const {return bShowIt;}
- void SetShowChanges(sal_Bool nFlag=sal_True){bShowIt=nFlag;}
+ bool ShowChanges() const {return bShowIt;}
+ void SetShowChanges(bool nFlag) {bShowIt=nFlag;}
- sal_Bool HasDate() const {return bIsDate;}
- void SetHasDate(sal_Bool nFlag=sal_True) {bIsDate=nFlag;}
+ bool HasDate() const {return bIsDate;}
+ void SetHasDate(bool nFlag) {bIsDate=nFlag;}
void SetTheDateMode(ScChgsDateMode eDatMod){
eDateMode=eDatMod; }
ScChgsDateMode GetTheDateMode() const { return eDateMode; }
@@ -95,35 +95,35 @@ public:
const DateTime& GetTheLastDateTime()const {return aLastDateTime;}
- sal_Bool HasAuthor() const {return bIsAuthor;}
- void SetHasAuthor(sal_Bool nFlag=sal_True)
{bIsAuthor=nFlag;}
+ bool HasAuthor() const {return bIsAuthor;}
+ void SetHasAuthor(bool nFlag) {bIsAuthor=nFlag;}
- OUString GetTheAuthorToShow()const {return aAuthorToShow;}
+ OUString GetTheAuthorToShow()const {return aAuthorToShow;}
void SetTheAuthorToShow(const OUString&
aString){aAuthorToShow=aString;}
- sal_Bool HasComment() const {return bIsComment;}
- void SetHasComment(sal_Bool nFlag=sal_True)
{bIsComment=nFlag;}
+ bool HasComment() const {return bIsComment;}
+ void SetHasComment(bool nFlag) {bIsComment=nFlag;}
- OUString GetTheComment()const {return aComment;}
+ OUString GetTheComment()const {return aComment;}
void SetTheComment(const OUString& aString);
- sal_Bool IsValidComment(const OUString* pCommentStr) const;
+ bool IsValidComment(const OUString* pCommentStr) const;
- sal_Bool IsEveryoneButMe() const {return bEveryoneButMe;}
- void SetEveryoneButMe(sal_Bool nFlag=sal_True)
{bEveryoneButMe=nFlag;}
+ bool IsEveryoneButMe() const {return bEveryoneButMe;}
+ void SetEveryoneButMe(bool nFlag) {bEveryoneButMe=nFlag;}
- sal_Bool HasRange() const {return bIsRange;}
- void SetHasRange(sal_Bool nFlag=sal_True) {bIsRange=nFlag;}
+ bool HasRange() const {return bIsRange;}
+ void SetHasRange(bool nFlag) {bIsRange=nFlag;}
const ScRangeList& GetTheRangeList()const {return aRangeList;}
void SetTheRangeList(const ScRangeList&
aRl){aRangeList=aRl;}
- sal_Bool IsShowAccepted() const { return bShowAccepted; }
- void SetShowAccepted( sal_Bool bVal ) { bShowAccepted =
bVal; }
+ bool IsShowAccepted() const { return bShowAccepted; }
+ void SetShowAccepted( bool bVal ) { bShowAccepted = bVal; }
- sal_Bool IsShowRejected() const { return bShowRejected; }
- void SetShowRejected( sal_Bool bVal ) { bShowRejected =
bVal; }
+ bool IsShowRejected() const { return bShowRejected; }
+ void SetShowRejected( bool bVal ) { bShowRejected = bVal; }
ScChangeViewSettings& operator= ( const ScChangeViewSettings& r );
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index 52620f5..17185aa 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -80,7 +80,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const
ScChangeViewSetting
return *this;
}
-sal_Bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr)
const
+bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const
{
bool nTheFlag = true;
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 9defd8a..d693243 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -492,7 +492,7 @@ void XclImpChangeTrack::Apply()
pChangeTrack = NULL;
ScChangeViewSettings aSettings;
- aSettings.SetShowChanges( sal_True );
+ aSettings.SetShowChanges( true );
GetDoc().SetChangeViewSettings( aSettings );
}
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e7cdf57..39838ff 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -884,8 +884,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint&
rHint )
if ( bChangedViewSettings )
{
-
pChangeViewSet->SetShowChanges( sal_True );
-
pChangeViewSet->SetShowAccepted( sal_True );
+
pChangeViewSet->SetShowChanges( true );
+
pChangeViewSet->SetShowAccepted( true );
aDocument.SetChangeViewSettings( *pChangeViewSet );
}
}
@@ -3137,7 +3137,7 @@ void ScDocShell::SetChangeRecording( bool bActivate )
{
aDocument.StartChangeTracking();
ScChangeViewSettings aChangeViewSet;
- aChangeViewSet.SetShowChanges(sal_True);
+ aChangeViewSet.SetShowChanges(true);
aDocument.SetChangeViewSettings(aChangeViewSet);
}
else
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index ad2806d..b744b62 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -803,7 +803,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool
bShared, bool bCheck
{
// visuelles RedLining einschalten
ScChangeViewSettings aChangeViewSet;
- aChangeViewSet.SetShowChanges(sal_True);
+ aChangeViewSet.SetShowChanges(true);
aDocument.SetChangeViewSettings(aChangeViewSet);
}
}
@@ -1293,8 +1293,8 @@ bool ScDocShell::MergeSharedDocument( ScDocShell*
pSharedDocShell )
nEndShared = pThisTrack->GetActionMax();
// only show changes from shared document
- aChangeViewSet.SetShowChanges( sal_True );
- aChangeViewSet.SetShowAccepted( sal_True );
+ aChangeViewSet.SetShowChanges( true );
+ aChangeViewSet.SetShowAccepted( true );
aChangeViewSet.SetHasActionRange( true );
aChangeViewSet.SetTheActionRange( nStartShared, nEndShared );
aDocument.SetChangeViewSettings( aChangeViewSet );
@@ -1337,8 +1337,8 @@ bool ScDocShell::MergeSharedDocument( ScDocShell*
pSharedDocShell )
sal_uLong nEndShared = pThisTrack->GetActionMax();
// only show changes from shared document
- aChangeViewSet.SetShowChanges( sal_True );
- aChangeViewSet.SetShowAccepted( sal_True );
+ aChangeViewSet.SetShowChanges( true );
+ aChangeViewSet.SetShowAccepted( true );
aChangeViewSet.SetHasActionRange( true );
aChangeViewSet.SetTheActionRange( nStartShared, nEndShared );
aDocument.SetChangeViewSettings( aChangeViewSet );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index eeb9e03..db9f38c 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -607,7 +607,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
{
pDoc->StartChangeTracking();
ScChangeViewSettings aChangeViewSet;
- aChangeViewSet.SetShowChanges(sal_True);
+ aChangeViewSet.SetShowChanges(true);
pDoc->SetChangeViewSettings(aChangeViewSet);
}
@@ -778,7 +778,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
if ( !pOldSet || !pOldSet->ShowChanges() )
{
ScChangeViewSettings aChangeViewSet;
- aChangeViewSet.SetShowChanges(sal_True);
+ aChangeViewSet.SetShowChanges(true);
aDocument.SetChangeViewSettings(aChangeViewSet);
}
}
@@ -790,8 +790,8 @@ void ScDocShell::Execute( SfxRequest& rReq )
{
// only show changes from merged document
ScChangeViewSettings aChangeViewSet;
- aChangeViewSet.SetShowChanges( sal_True );
- aChangeViewSet.SetShowAccepted( sal_True );
+ aChangeViewSet.SetShowChanges( true );
+ aChangeViewSet.SetShowAccepted( true );
aChangeViewSet.SetHasActionRange( true );
aChangeViewSet.SetTheActionRange( nStart, nEnd
);
aDocument.SetChangeViewSettings(
aChangeViewSet );
commit de139552bead429544e16f2c3bffd1fcbbc3c91b
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 14:34:15 2014 +0200
sal_Bool->bool
Change-Id: Id85765e1ae560364d8cf5e33b509473a362d63ed
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 4f54357..d15a070 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -184,7 +184,7 @@ private:
ScDocument* m_pDocument;
SfxItemPropertySet m_aPropSet;
- sal_Bool m_bIncludeHiddenCells;
+ bool m_bIncludeHiddenCells;
};
// DataSource
@@ -428,7 +428,7 @@ private:
// properties
::com::sun::star::chart2::data::DataSequenceRole m_aRole;
- sal_Bool m_bIncludeHiddenCells;
+ bool m_bIncludeHiddenCells;
// internals
typedef boost::scoped_ptr<std::vector<ScTokenRef> > TokenListPtr;
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53e6fc1..4066415 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1008,7 +1008,7 @@ void lcl_convertTokensToString(OUString& rStr, const
vector<ScTokenRef>& rTokens
ScChart2DataProvider::ScChart2DataProvider( ScDocument* pDoc )
: m_pDocument( pDoc)
, m_aPropSet(lcl_GetDataProviderPropertyMap())
- , m_bIncludeHiddenCells( sal_True)
+ , m_bIncludeHiddenCells( true)
{
if ( m_pDocument )
m_pDocument->AddUnoObject( *this);
@@ -3465,7 +3465,7 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue(
}
else if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
{
- sal_Bool bOldValue = m_bIncludeHiddenCells;
+ bool bOldValue = m_bIncludeHiddenCells;
if ( !(rValue >>= m_bIncludeHiddenCells))
throw lang::IllegalArgumentException();
if( bOldValue != m_bIncludeHiddenCells )
commit f8e5ba4f514487ddc8fa1b42f6d536d00728ddf7
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 14:20:33 2014 +0200
sal_Bool->bool
Change-Id: I7c60759d199da6b0d1494cf31e1577808e618627
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index fed134e..1f89aa6 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -830,7 +830,7 @@ private:
private:
OUString GetInputString_Impl(bool bEnglish) const;
OUString GetOutputString_Impl() const;
- void SetString_Impl(const OUString& rString, sal_Bool bInterpret,
sal_Bool bEnglish);
+ void SetString_Impl(const OUString& rString, bool bInterpret, bool
bEnglish);
double GetValue_Impl() const;
void SetValue_Impl(double fValue);
com::sun::star::table::CellContentType GetResultType_Impl();
@@ -1371,7 +1371,7 @@ private:
ScRangeList aRanges;
ScAddress aPos;
ScMarkData* pMark;
- sal_Bool bAtEnd;
+ bool bAtEnd;
private:
void Advance_Impl();
@@ -1454,8 +1454,8 @@ private:
SCTAB nTab;
ScAttrRectIterator* pIter;
ScRange aNext;
- sal_Bool bAtEnd;
- sal_Bool bDirty;
+ bool bAtEnd;
+ bool bDirty;
private:
void Advance_Impl();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index d97b2b5..3fe3fb0 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6237,7 +6237,7 @@ OUString ScCellObj::GetOutputString_Impl() const
return aVal;
}
-void ScCellObj::SetString_Impl(const OUString& rString, sal_Bool bInterpret,
sal_Bool bEnglish)
+void ScCellObj::SetString_Impl(const OUString& rString, bool bInterpret, bool
bEnglish)
{
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
@@ -6513,7 +6513,7 @@ void SAL_CALL ScCellObj::setFormula( const OUString&
aFormula ) throw(uno::Runti
{
SolarMutexGuard aGuard;
OUString aString(aFormula);
- SetString_Impl(aString, sal_True, sal_True); // Interpret as English
+ SetString_Impl(aString, true, true); // Interpret as English
}
double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException)
@@ -6726,7 +6726,7 @@ void ScCellObj::SetOnePropertyValue( const
SfxItemPropertySimpleEntry* pEntry, c
OUString aStrVal;
aValue >>= aStrVal;
OUString aString(aStrVal);
- SetString_Impl(aString, sal_True, false); // lokal interpretieren
+ SetString_Impl(aString, true, false); // lokal interpretieren
}
else if ( pEntry->nWID == SC_WID_UNO_FORMRT )
{
@@ -9235,7 +9235,7 @@ void ScCellsEnumeration::Advance_Impl()
if (bFound)
aPos.Set( nCol, nRow, nTab );
else
- bAtEnd = sal_True; // kommt nix mehr
+ bAtEnd = true; // kommt nix mehr
}
void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -9463,10 +9463,10 @@ void ScCellFormatsEnumeration::Advance_Impl()
if ( pIter->GetNext( nCol1, nCol2, nRow1, nRow2 ) )
aNext = ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
else
- bAtEnd = sal_True; // kommt nix mehr
+ bAtEnd = true; // kommt nix mehr
}
else
- bAtEnd = sal_True; // Dok weggekommen oder so
+ bAtEnd = true; // Dok weggekommen oder so
}
ScCellRangeObj* ScCellFormatsEnumeration::NextObject_Impl()
@@ -9500,7 +9500,7 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&,
const SfxHint& rHint )
}
else if ( nId == SFX_HINT_DATACHANGED )
{
- bDirty = sal_True; // AttrArray-Index evtl. ungueltig
geworden
+ bDirty = true; // AttrArray-Index evtl. ungueltig geworden
}
}
}
commit 2b015cd8adaca8345cc520eff369b5429c1bed37
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jan 17 14:08:08 2014 +0200
sal_Bool->bool
Change-Id: Ibe1a978835a3ccd3c34d289db56f12e53b42087b
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 4e85421..fed134e 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -247,7 +247,7 @@ public:
ScDocShell* GetDocShell() const { return pDocShell; }
ScDocument* GetDocument() const;
const ScRangeList& GetRangeList() const { return aRanges; }
- void AddRange(const ScRange& rRange, const sal_Bool
bMergeRanges);
+ void AddRange(const ScRange& rRange, const bool
bMergeRanges);
// arouse object created via service:
void InitInsertRange(ScDocShell* pDocSh, const ScRange&
rR);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index d4c01cc..d97b2b5 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1706,7 +1706,7 @@ void ScCellRangesBase::InitInsertRange(ScDocShell*
pDocSh, const ScRange& rR)
}
}
-void ScCellRangesBase::AddRange(const ScRange& rRange, const sal_Bool
bMergeRanges)
+void ScCellRangesBase::AddRange(const ScRange& rRange, const bool bMergeRanges)
{
if (bMergeRanges)
aRanges.Join(rRange);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
