[Libreoffice-commits] core.git: 13 commits - sc/inc sc/source
Noel Grandin
noel at peralex.com
Mon Feb 10 04:45:51 PST 2014
sc/inc/dispuno.hxx | 2 -
sc/inc/docoptio.hxx | 50 +++++++++++++++----------------
sc/inc/docpool.hxx | 2 -
sc/inc/docuno.hxx | 4 +-
sc/inc/dpgroup.hxx | 22 ++++++-------
sc/inc/dpsdbtab.hxx | 8 ++--
sc/inc/dpshttab.hxx | 10 +++---
sc/inc/dptabdat.hxx | 24 +++++++-------
sc/inc/dptabsrc.hxx | 12 +++----
sc/inc/drwlayer.hxx | 29 ++++++++---------
sc/source/core/data/docpool.cxx | 4 +-
sc/source/core/data/documen9.cxx | 2 -
sc/source/core/data/dpgroup.cxx | 16 ++++-----
sc/source/core/data/dpsdbtab.cxx | 6 +--
sc/source/core/data/dpshttab.cxx | 6 +--
sc/source/core/data/dptabdat.cxx | 8 ++--
sc/source/core/data/dptabres.cxx | 4 +-
sc/source/core/data/dptabsrc.cxx | 6 +--
sc/source/core/data/drwlayer.cxx | 47 +++++++++++++----------------
sc/source/core/tool/detfunc.cxx | 8 ++--
sc/source/filter/excel/impop.cxx | 2 -
sc/source/filter/excel/xiescher.cxx | 2 -
sc/source/filter/oox/drawingfragment.cxx | 2 -
sc/source/ui/drawfunc/drawsh.cxx | 6 +--
sc/source/ui/unoobj/dispuno.cxx | 2 -
sc/source/ui/unoobj/docuno.cxx | 6 +--
sc/source/ui/view/viewdata.cxx | 2 -
27 files changed, 143 insertions(+), 149 deletions(-)
New commits:
commit c1dd14ba87c0223ae9ec14c381796cd859b4b713
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 14:40:25 2014 +0200
sal_Bool->bool
and remove unused parameter from ScCopyPage
Change-Id: Iba5a5adea8d5b4a56d77297325cc79d63465f15d
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 095a27b..750b8df 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -84,9 +84,9 @@ private:
OUString aName;
ScDocument* pDoc;
SdrUndoGroup* pUndoGroup;
- sal_Bool bRecording;
- sal_Bool bAdjustEnabled;
- sal_Bool bHyphenatorSet;
+ bool bRecording;
+ bool bAdjustEnabled;
+ bool bHyphenatorSet;
private:
void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
@@ -105,35 +105,34 @@ public:
virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
- sal_Bool HasObjects() const;
+ bool HasObjects() const;
- sal_Bool ScAddPage( SCTAB nTab );
+ bool ScAddPage( SCTAB nTab );
void ScRemovePage( SCTAB nTab );
void ScRenamePage( SCTAB nTab, const OUString& rNewName );
void ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
- // incl. content, bAlloc=FALSE -> only content
- void ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool bAlloc );
+ void ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos);
void ResetTab( SCTAB nStart, SCTAB nEnd );
ScDocument* GetDocument() const { return pDoc; }
void UseHyphenator();
- sal_Bool GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const;
+ bool GetPrintArea( ScRange& rRange, bool bSetHor, bool bSetVer ) const;
// automatic adjustments
- void EnableAdjust( sal_Bool bSet = sal_True ) { bAdjustEnabled = bSet; }
+ void EnableAdjust( bool bSet = true ) { bAdjustEnabled = bSet; }
void BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager);
SdrUndoGroup* GetCalcUndo();
- sal_Bool IsRecording() const { return bRecording; }
+ bool IsRecording() const { return bRecording; }
void AddCalcUndo( SdrUndoAction* pUndo );
void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy, sal_Bool bInsDel, bool bUpdateNoteCaptionPos = true );
+ SCsCOL nDx,SCsROW nDy, bool bInsDel, bool bUpdateNoteCaptionPos = true );
- sal_Bool HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow );
+ bool HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow );
void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
SCCOL nCol2,SCROW nRow2 );
@@ -175,8 +174,8 @@ public:
static ScAnchorType GetAnchorType( const SdrObject& );
// positions for detektive lines
- static ScDrawObjData* GetObjData( SdrObject* pObj, sal_Bool bCreate=false );
- static ScDrawObjData* GetNonRotatedObjData( SdrObject* pObj, sal_Bool bCreate=false );
+ static ScDrawObjData* GetObjData( SdrObject* pObj, bool bCreate=false );
+ static ScDrawObjData* GetNonRotatedObjData( SdrObject* pObj, bool bCreate=false );
// The sheet information in ScDrawObjData isn't updated when sheets are inserted/deleted.
// Use this method to get an object with positions on the specified sheet (should be the
@@ -195,7 +194,7 @@ public:
static IMapObject* GetHitIMapObject( SdrObject* pObject,
const Point& rWinPoint, const Window& rCmpWnd );
- static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = false );
+ static ScMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate = false );
virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
virtual sal_Int32 GetHyperlinkCount(SdrObject* pObj);
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 52a4547..46450c9 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -242,7 +242,7 @@ void ScDocument::DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
void ScDocument::DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
{
// angelegt wird die Page schon im ScTable ctor
- pDrawLayer->ScCopyPage( nOldPos, nNewPos, false );
+ pDrawLayer->ScCopyPage( nOldPos, nNewPos );
}
void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index b7aa8b5..5fb2b86 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -200,7 +200,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) :
pDoc( pDocument ),
pUndoGroup( NULL ),
bRecording( false ),
- bAdjustEnabled( sal_True ),
+ bAdjustEnabled( true ),
bHyphenatorSet( false )
{
pGlobalDrawPersist = NULL; // nur einmal benutzen
@@ -310,7 +310,7 @@ void ScDrawLayer::UseHyphenator()
GetDrawOutliner().SetHyphenator( xHyphenator );
GetHitTestOutliner().SetHyphenator( xHyphenator );
- bHyphenatorSet = sal_True;
+ bHyphenatorSet = true;
}
}
@@ -319,14 +319,14 @@ SdrPage* ScDrawLayer::AllocPage(bool bMasterPage)
return new ScDrawPage(*this, bMasterPage);
}
-sal_Bool ScDrawLayer::HasObjects() const
+bool ScDrawLayer::HasObjects() const
{
- sal_Bool bFound = false;
+ bool bFound = false;
sal_uInt16 nCount = GetPageCount();
for (sal_uInt16 i=0; i<nCount && !bFound; i++)
if (GetPage(i)->GetObjCount())
- bFound = sal_True;
+ bFound = true;
return bFound;
}
@@ -339,7 +339,7 @@ SdrModel* ScDrawLayer::AllocModel() const
return new ScDrawLayer( NULL, aName );
}
-sal_Bool ScDrawLayer::ScAddPage( SCTAB nTab )
+bool ScDrawLayer::ScAddPage( SCTAB nTab )
{
if (bDrawIsInUndo)
return false; // not inserted
@@ -385,15 +385,13 @@ void ScDrawLayer::ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
ResetTab(nMinPos, pDoc->GetTableCount()-1);
}
-void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool bAlloc )
+void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos)
{
- //! remove argument bAlloc (always sal_False)
-
if (bDrawIsInUndo)
return;
SdrPage* pOldPage = GetPage(nOldPos);
- SdrPage* pNewPage = bAlloc ? AllocPage(false) : GetPage(nNewPos);
+ SdrPage* pNewPage = GetPage(nNewPos);
// kopieren
@@ -432,9 +430,6 @@ void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool b
}
}
- if (bAlloc)
- InsertPage(pNewPage, nNewPos);
-
ResetTab(static_cast<SCTAB>(nNewPos), pDoc->GetTableCount()-1);
}
@@ -876,7 +871,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
}
}
-sal_Bool ScDrawLayer::GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const
+bool ScDrawLayer::GetPrintArea( ScRange& rRange, bool bSetHor, bool bSetVer ) const
{
OSL_ENSURE( pDoc, "ScDrawLayer::GetPrintArea without document" );
if ( !pDoc )
@@ -887,7 +882,7 @@ sal_Bool ScDrawLayer::GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool
sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
- sal_Bool bAny = false;
+ bool bAny = false;
long nEndX = 0;
long nEndY = 0;
long nStartX = LONG_MAX;
@@ -954,7 +949,7 @@ sal_Bool ScDrawLayer::GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool
if (aObjRect.Top() < nStartY) nStartY = aObjRect.Top();
if (aObjRect.Bottom() > nEndY) nEndY = aObjRect.Bottom();
}
- bAny = sal_True;
+ bAny = true;
}
pObject = aIter.Next();
@@ -1034,7 +1029,7 @@ void ScDrawLayer::BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager)
{
SetDisableTextEditUsesCommonUndoManager(bDisableTextEditUsesCommonUndoManager);
DELETEZ(pUndoGroup);
- bRecording = sal_True;
+ bRecording = true;
}
SdrUndoGroup* ScDrawLayer::GetCalcUndo()
@@ -1047,7 +1042,7 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo()
}
void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy, sal_Bool bInsDel, bool bUpdateNoteCaptionPos )
+ SCsCOL nDx,SCsROW nDy, bool bInsDel, bool bUpdateNoteCaptionPos )
{
OSL_ENSURE( pDoc, "ScDrawLayer::MoveArea without document" );
if ( !pDoc )
@@ -1094,7 +1089,7 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR
MoveCells( nTab, nCol1,nRow1, nCol2,nRow2, nDx,nDy, bUpdateNoteCaptionPos );
}
-sal_Bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
+bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
{
OSL_ENSURE( pDoc, "ScDrawLayer::HasObjectsInRows without document" );
if ( !pDoc )
@@ -1103,11 +1098,11 @@ sal_Bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndR
SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
OSL_ENSURE(pPage,"Page not found");
if (!pPage)
- return sal_False;
+ return false;
// for an empty page, there's no need to calculate the row heights
if (!pPage->GetObjCount())
- return sal_False;
+ return false;
Rectangle aTestRect;
@@ -1131,7 +1126,7 @@ sal_Bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndR
if ( bNegativePage )
MirrorRectRTL( aTestRect );
- sal_Bool bFound = false;
+ bool bFound = false;
Rectangle aObjRect;
SdrObjListIter aIter( *pPage );
@@ -1893,7 +1888,7 @@ ScAnchorType ScDrawLayer::GetAnchorType( const SdrObject &rObj )
return ScDrawLayer::GetObjData(const_cast<SdrObject*>(&rObj)) ? SCA_CELL : SCA_PAGE;
}
-ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, sal_Bool bCreate )
+ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, bool bCreate )
{
sal_uInt16 nCount = pObj ? pObj->GetUserDataCount() : 0;
sal_uInt16 nFound = 0;
@@ -1912,7 +1907,7 @@ ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, sal_Bool bCre
return 0;
}
-ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, sal_Bool bCreate )
+ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, bool bCreate )
{
if (SdrObjUserData *pData = GetFirstUserDataOfType(pObj, SC_UD_OBJDATA))
return (ScDrawObjData*) pData;
@@ -2021,7 +2016,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
return pIMapObj;
}
-ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, sal_Bool bCreate )
+ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, bool bCreate )
{
if (SdrObjUserData *pData = GetFirstUserDataOfType(pObj, SC_UD_MACRODATA))
return (ScMacroInfo*) pData;
@@ -2048,7 +2043,7 @@ ImageMap* ScDrawLayer::GetImageMapForObject(SdrObject* pObj)
sal_Int32 ScDrawLayer::GetHyperlinkCount(SdrObject* pObj)
{
sal_Int32 nHLCount = 0;
- ScMacroInfo* pMacroInfo = GetMacroInfo(pObj, sal_False);
+ ScMacroInfo* pMacroInfo = GetMacroInfo(pObj, false);
if (pMacroInfo)
// MT IA2: GetHlink*( doesn|t exist in DEV300 anymore...
nHLCount = 0; // pMacroInfo->GetHlink().getLength() > 0 ? 1 : 0;
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 0ccd696..5d2e11c 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -475,7 +475,7 @@ bool ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
pPage->InsertObject( pBox );
pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
- ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, sal_True );
+ ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, true );
pData->maStart.Set( nRefStartCol, nRefStartRow, nTab);
pData->maEnd.Set( nRefEndCol, nRefEndRow, nTab);
}
@@ -548,7 +548,7 @@ bool ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
pPage->InsertObject( pBox );
pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
- ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, sal_True );
+ ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, true );
pData->maStart.Set( nStartCol, nStartRow, nTab);
pData->maEnd.Set( nEndCol, nEndRow, nTab);
}
@@ -582,7 +582,7 @@ bool ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
pPage->InsertObject( pArrow );
pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
- ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, sal_True );
+ ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, true );
pData->maStart.Set( nStartCol, nStartRow, nTab);
pData->maEnd.SetInvalid();
@@ -648,7 +648,7 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData
pPage->InsertObject( pCircle );
pModel->AddCalcUndo( new SdrUndoInsertObj( *pCircle ) );
- ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, sal_True );
+ ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, true );
pData->maStart.Set( nCol, nRow, nTab);
pData->maEnd.SetInvalid();
pData->meType = ScDrawObjData::ValidationCircle;
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 29dcb6f..01ceede 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -557,7 +557,7 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
// removed oracle/sun check for mbSimpleMacro ( no idea what its for )
if (!maMacroName.isEmpty() || !maHyperlink.isEmpty())
{
- if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, sal_True ) )
+ if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, true ) )
{
pInfo->SetMacro( XclTools::GetSbMacroUrl( maMacroName, GetDocShell() ) );
pInfo->SetHlink( maHyperlink );
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index dc879e2..a3ca08f 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -114,7 +114,7 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >&
SdrObject* pObj = SdrObject::getSdrObjectFromXShape( mxShape );
if ( pObj )
{
- if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True ) )
+ if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true ) )
pInfo->SetHlink( sURL );
}
}
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 9697dce..c8d11f5 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -320,7 +320,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
{
SvxMacroItem aItem ( SFX_APP()->GetPool().GetWhich( SID_ATTR_MACROITEM ) );
- ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True );
+ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true );
if ( !pInfo->GetMacro().isEmpty() )
{
SvxMacroTableDtor aTab;
@@ -360,7 +360,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
sal_uLong nObj = pOL->GetObjCount();
for ( sal_uLong index=0; index<nObj; ++index )
{
- pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), sal_True );
+ pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), true );
pInfo->SetMacro( sMacro );
}
}
@@ -476,7 +476,7 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk )
{
if ( pObj )
{
- ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True );
+ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true );
pInfo->SetHlink( rHlnk );
lcl_setModified( GetObjectShell() );
}
commit d359e422705c591d815daefaca3e1c9c53f64756
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 14:17:21 2014 +0200
sal_Bool->bool
Change-Id: I3746ab9c065429815e7b0f91077a4bbef1223d1d
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index cff29df..6cdd755 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -162,7 +162,7 @@ public:
virtual bool IsDateDimension(long nDim);
virtual sal_uLong GetNumberFormat(long nDim);
virtual void DisposeData();
- virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
+ virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty );
virtual bool IsRepeatIfEmpty();
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index 0bbab7f..8bab648 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -69,7 +69,7 @@ public:
virtual bool getIsDataLayoutDimension(long nColumn);
virtual bool IsDateDimension(long nDim);
virtual void DisposeData();
- virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
+ virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty );
virtual void CreateCacheTable();
virtual void FilterCacheTable(const ::std::vector<ScDPFilteredCache::Criterion>& rCriteria, const ::boost::unordered_set<sal_Int32>& rDataDims);
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 1d61769..53d4819 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -107,7 +107,7 @@ public:
virtual bool IsDateDimension(long nDim);
virtual sal_uLong GetNumberFormat(long nDim);
virtual void DisposeData();
- virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
+ virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty );
virtual bool IsRepeatIfEmpty();
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 1bf6114..e9a8d3f 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -116,7 +116,7 @@ public:
virtual sal_uLong GetNumberFormat(long nDim);
virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset );
virtual void DisposeData() = 0;
- virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ) = 0;
+ virtual void SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty ) = 0;
virtual bool IsRepeatIfEmpty();
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 7121f8b..361a74f 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -647,7 +647,7 @@ void ScDPGroupTableData::DisposeData()
pSourceData->DisposeData();
}
-void ScDPGroupTableData::SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty )
+void ScDPGroupTableData::SetEmptyFlags( bool bIgnoreEmptyRows, bool bRepeatIfEmpty )
{
pSourceData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
}
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 3a205be..27405bc 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -110,7 +110,7 @@ bool ScDatabaseDPData::IsDateDimension(long /* nDim */)
return false;
}
-void ScDatabaseDPData::SetEmptyFlags( sal_Bool /* bIgnoreEmptyRows */, sal_Bool /* bRepeatIfEmpty */ )
+void ScDatabaseDPData::SetEmptyFlags( bool /* bIgnoreEmptyRows */, bool /* bRepeatIfEmpty */ )
{
// not used for database data
//! disable flags
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 57b2103..5230632 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -154,7 +154,7 @@ bool ScSheetDPData::getIsDataLayoutDimension(long nColumn)
return (nColumn ==(long)( aCacheTable.getColSize()));
}
-void ScSheetDPData::SetEmptyFlags( sal_Bool bIgnoreEmptyRowsP, sal_Bool bRepeatIfEmptyP )
+void ScSheetDPData::SetEmptyFlags( bool bIgnoreEmptyRowsP, bool bRepeatIfEmptyP )
{
bIgnoreEmptyRows = bIgnoreEmptyRowsP;
bRepeatIfEmpty = bRepeatIfEmptyP;
commit f32e6d14c880ba38c1398083eb4145cb3cac5230
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 14:11:23 2014 +0200
sal_Bool->bool
Change-Id: I131f8fe012f3ed5908fee40459941dd43c284bc8
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index fbf11b5..cff29df 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -180,7 +180,7 @@ public:
virtual bool IsNumOrDateGroup(long nDim) const;
virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
- virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+ virtual bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const;
#if DEBUG_PIVOT_TABLE
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 46815ba..1bf6114 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -135,7 +135,7 @@ public:
virtual bool IsNumOrDateGroup(long nDim) const;
virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
- virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+ virtual bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const;
virtual long GetMembersCount( long nDim );
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 5ff7a78..7121f8b 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -992,7 +992,7 @@ bool ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupI
return true;
}
-sal_Bool ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+bool ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const
{
const ScDPGroupDimension* pFirstDim = NULL;
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 821dbb6..954cdee 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -142,7 +142,7 @@ bool ScDPTableData::IsInGroup( const ScDPItemData&, long,
return false;
}
-sal_Bool ScDPTableData::HasCommonElement( const ScDPItemData&, long,
+bool ScDPTableData::HasCommonElement( const ScDPItemData&, long,
const ScDPItemData&, long ) const
{
OSL_FAIL("HasCommonElement shouldn't be called for non-group data");
commit 11491b64130fc551f4ee363f9fd2af5d0bb029fb
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 14:07:10 2014 +0200
sal_Bool->bool
Change-Id: Ic9466e26cef1539a76bc838d0424dc3c0c0d34dd
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 044e9fe..fbf11b5 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -178,7 +178,7 @@ public:
virtual bool IsBaseForGroup(long nDim) const;
virtual long GetGroupBase(long nGroupDim) const;
virtual bool IsNumOrDateGroup(long nDim) const;
- virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+ virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const;
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 96f49ef..46815ba 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -133,7 +133,7 @@ public:
virtual bool IsBaseForGroup(long nDim) const;
virtual long GetGroupBase(long nGroupDim) const;
virtual bool IsNumOrDateGroup(long nDim) const;
- virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+ virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index bde292c..5ff7a78 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -964,7 +964,7 @@ bool ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
return false;
}
-sal_Bool ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+bool ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const
{
for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 4c3475a..821dbb6 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -135,7 +135,7 @@ bool ScDPTableData::IsNumOrDateGroup(long) const
return false; // always false
}
-sal_Bool ScDPTableData::IsInGroup( const ScDPItemData&, long,
+bool ScDPTableData::IsInGroup( const ScDPItemData&, long,
const ScDPItemData&, long ) const
{
OSL_FAIL("IsInGroup shouldn't be called for non-group data");
commit d9b7412387f4feace63f63ee7f1bfd7eba01e57a
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 14:02:29 2014 +0200
sal_Bool->bool
Change-Id: Iba6a2b7d18f630cacbf8fda8d99c55e10e1abe92
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index dc8b5dc..044e9fe 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -177,7 +177,7 @@ public:
virtual bool IsBaseForGroup(long nDim) const;
virtual long GetGroupBase(long nGroupDim) const;
- virtual sal_Bool IsNumOrDateGroup(long nDim) const;
+ virtual bool IsNumOrDateGroup(long nDim) const;
virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index c6702be..96f49ef 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -132,7 +132,7 @@ public:
// overloaded in ScDPGroupTableData:
virtual bool IsBaseForGroup(long nDim) const;
virtual long GetGroupBase(long nGroupDim) const;
- virtual sal_Bool IsNumOrDateGroup(long nDim) const;
+ virtual bool IsNumOrDateGroup(long nDim) const;
virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 71f8006..bde292c 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -944,7 +944,7 @@ long ScDPGroupTableData::GetGroupBase(long nGroupDim) const
return -1; // none
}
-sal_Bool ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
+bool ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
{
// Virtual method from ScDPTableData, used in result data to force text labels.
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index a35a021..4c3475a 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -130,7 +130,7 @@ long ScDPTableData::GetGroupBase(long) const
return -1; // always none
}
-sal_Bool ScDPTableData::IsNumOrDateGroup(long) const
+bool ScDPTableData::IsNumOrDateGroup(long) const
{
return false; // always false
}
commit acf5f162662b94b149873e538f6bd8d69977f909
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 13:58:08 2014 +0200
sal_Bool->bool
Change-Id: Iadbdb3b96d5e546e407e80f1ccc65e5db5f84f4e
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 4065361..dc8b5dc 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -175,12 +175,12 @@ public:
virtual const ScDPFilteredCache& GetCacheTable() const;
virtual void ReloadCacheTable();
- virtual sal_Bool IsBaseForGroup(long nDim) const;
+ virtual bool IsBaseForGroup(long nDim) const;
virtual long GetGroupBase(long nGroupDim) const;
- virtual sal_Bool IsNumOrDateGroup(long nDim) const;
- virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+ virtual sal_Bool IsNumOrDateGroup(long nDim) const;
+ virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
- virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+ virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const;
#if DEBUG_PIVOT_TABLE
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index da1891c..c6702be 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -130,12 +130,12 @@ public:
virtual void ReloadCacheTable() = 0;
// overloaded in ScDPGroupTableData:
- virtual sal_Bool IsBaseForGroup(long nDim) const;
- virtual long GetGroupBase(long nGroupDim) const;
- virtual sal_Bool IsNumOrDateGroup(long nDim) const;
- virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+ virtual bool IsBaseForGroup(long nDim) const;
+ virtual long GetGroupBase(long nGroupDim) const;
+ virtual sal_Bool IsNumOrDateGroup(long nDim) const;
+ virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
const ScDPItemData& rBaseData, long nBaseIndex ) const;
- virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+ virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
const ScDPItemData& rSecondData, long nSecondIndex ) const;
virtual long GetMembersCount( long nDim );
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index df4c0df..71f8006 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -920,13 +920,13 @@ void ScDPGroupTableData::FillGroupValues(vector<SCROW>& rItems, const vector<lon
}
}
-sal_Bool ScDPGroupTableData::IsBaseForGroup(long nDim) const
+bool ScDPGroupTableData::IsBaseForGroup(long nDim) const
{
for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter )
{
const ScDPGroupDimension& rDim = *aIter;
if ( rDim.GetSourceDim() == nDim )
- return sal_True;
+ return true;
}
return false;
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index fdd5b5a..a35a021 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -120,7 +120,7 @@ sal_uLong ScDPTableData::GetNumberFormat(long)
return 0; // default format
}
-sal_Bool ScDPTableData::IsBaseForGroup(long) const
+bool ScDPTableData::IsBaseForGroup(long) const
{
return false; // always false
}
commit 1c0f0a9f5b1772a8ac43230de79e39c65f0663df
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 13:53:24 2014 +0200
sal_Bool->bool
Change-Id: Id5a104fb70745e43da056c82ae44841c8b54abb2
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 39e3f6e..4065361 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -159,7 +159,7 @@ public:
virtual OUString getDimensionName(long nColumn);
virtual bool getIsDataLayoutDimension(long nColumn);
- virtual sal_Bool IsDateDimension(long nDim);
+ virtual bool IsDateDimension(long nDim);
virtual sal_uLong GetNumberFormat(long nDim);
virtual void DisposeData();
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index 48f93e7..0bbab7f 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -67,7 +67,7 @@ public:
virtual long GetColumnCount();
virtual OUString getDimensionName(long nColumn);
virtual bool getIsDataLayoutDimension(long nColumn);
- virtual sal_Bool IsDateDimension(long nDim);
+ virtual bool IsDateDimension(long nDim);
virtual void DisposeData();
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 559308d..1d61769 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -104,7 +104,7 @@ public:
virtual long GetColumnCount();
virtual OUString getDimensionName(long nColumn);
virtual bool getIsDataLayoutDimension(long nColumn);
- virtual sal_Bool IsDateDimension(long nDim);
+ virtual bool IsDateDimension(long nDim);
virtual sal_uLong GetNumberFormat(long nDim);
virtual void DisposeData();
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 6148723..da1891c 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -112,7 +112,7 @@ public:
virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
virtual OUString getDimensionName(long nColumn) = 0;
virtual bool getIsDataLayoutDimension(long nColumn) = 0;
- virtual sal_Bool IsDateDimension(long nDim) = 0;
+ virtual bool IsDateDimension(long nDim) = 0;
virtual sal_uLong GetNumberFormat(long nDim);
virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset );
virtual void DisposeData() = 0;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 3fe4645..df4c0df 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -610,7 +610,7 @@ bool ScDPGroupTableData::getIsDataLayoutDimension(long nColumn)
return ( nColumn == sal::static_int_cast<long>( nSourceCount + aGroups.size() ) ); // data layout dimension?
}
-sal_Bool ScDPGroupTableData::IsDateDimension(long nDim)
+bool ScDPGroupTableData::IsDateDimension(long nDim)
{
if ( nDim >= nSourceCount )
{
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index a671926..3a205be 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -104,7 +104,7 @@ bool ScDatabaseDPData::getIsDataLayoutDimension(long nColumn)
return ( nColumn == GetCacheTable().getColSize());
}
-sal_Bool ScDatabaseDPData::IsDateDimension(long /* nDim */)
+bool ScDatabaseDPData::IsDateDimension(long /* nDim */)
{
//! later...
return false;
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index ec97915..57b2103 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -101,7 +101,7 @@ OUString ScSheetDPData::getDimensionName(long nColumn)
}
}
-sal_Bool ScSheetDPData::IsDateDimension(long nDim)
+bool ScSheetDPData::IsDateDimension(long nDim)
{
CreateCacheTable();
long nColCount = aCacheTable.getColSize();
commit 6be783933d039708844e9ee9eb2742a1f0c8e367
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 13:42:17 2014 +0200
sal_Bool->bool
Change-Id: I4b8c94ae4b2bf3f1fc1f97b4533221f40b8d1907
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index bc99c1c..39e3f6e 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -152,15 +152,15 @@ public:
ScDocument* GetDocument() { return pDoc; }
virtual long GetColumnCount();
- virtual long GetMembersCount( long nDim );
- virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
+ virtual long GetMembersCount( long nDim );
+ virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
virtual const ScDPItemData* GetMemberById( long nDim, long nId);
virtual long Compare( long nDim, long nDataId1, long nDataId2);
- virtual OUString getDimensionName(long nColumn);
- virtual sal_Bool getIsDataLayoutDimension(long nColumn);
- virtual sal_Bool IsDateDimension(long nDim);
- virtual sal_uLong GetNumberFormat(long nDim);
+ virtual OUString getDimensionName(long nColumn);
+ virtual bool getIsDataLayoutDimension(long nColumn);
+ virtual sal_Bool IsDateDimension(long nDim);
+ virtual sal_uLong GetNumberFormat(long nDim);
virtual void DisposeData();
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index bc30600..48f93e7 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -65,9 +65,9 @@ public:
virtual ~ScDatabaseDPData();
virtual long GetColumnCount();
- virtual OUString getDimensionName(long nColumn);
- virtual sal_Bool getIsDataLayoutDimension(long nColumn);
- virtual sal_Bool IsDateDimension(long nDim);
+ virtual OUString getDimensionName(long nColumn);
+ virtual bool getIsDataLayoutDimension(long nColumn);
+ virtual sal_Bool IsDateDimension(long nDim);
virtual void DisposeData();
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index bbb239a..559308d 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -102,10 +102,10 @@ public:
virtual ~ScSheetDPData();
virtual long GetColumnCount();
- virtual OUString getDimensionName(long nColumn);
- virtual sal_Bool getIsDataLayoutDimension(long nColumn);
- virtual sal_Bool IsDateDimension(long nDim);
- virtual sal_uLong GetNumberFormat(long nDim);
+ virtual OUString getDimensionName(long nColumn);
+ virtual bool getIsDataLayoutDimension(long nColumn);
+ virtual sal_Bool IsDateDimension(long nDim);
+ virtual sal_uLong GetNumberFormat(long nDim);
virtual void DisposeData();
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 3239a80..6148723 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -109,12 +109,12 @@ public:
//! or separate Str and ValueCollection
virtual long GetColumnCount() = 0;
- virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
- virtual OUString getDimensionName(long nColumn) = 0;
- virtual sal_Bool getIsDataLayoutDimension(long nColumn) = 0;
- virtual sal_Bool IsDateDimension(long nDim) = 0;
- virtual sal_uLong GetNumberFormat(long nDim);
- virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset );
+ virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
+ virtual OUString getDimensionName(long nColumn) = 0;
+ virtual bool getIsDataLayoutDimension(long nColumn) = 0;
+ virtual sal_Bool IsDateDimension(long nDim) = 0;
+ virtual sal_uLong GetNumberFormat(long nDim);
+ virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset );
virtual void DisposeData() = 0;
virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ) = 0;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index e5da799..3fe4645 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -604,7 +604,7 @@ OUString ScDPGroupTableData::getDimensionName(long nColumn)
return pSourceData->getDimensionName( nColumn );
}
-sal_Bool ScDPGroupTableData::getIsDataLayoutDimension(long nColumn)
+bool ScDPGroupTableData::getIsDataLayoutDimension(long nColumn)
{
// position of data layout dimension is moved from source data
return ( nColumn == sal::static_int_cast<long>( nSourceCount + aGroups.size() ) ); // data layout dimension?
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 9f50a68..a671926 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -99,7 +99,7 @@ OUString ScDatabaseDPData::getDimensionName(long nColumn)
return aCacheTable.getFieldName(static_cast<SCCOL>(nColumn));
}
-sal_Bool ScDatabaseDPData::getIsDataLayoutDimension(long nColumn)
+bool ScDatabaseDPData::getIsDataLayoutDimension(long nColumn)
{
return ( nColumn == GetCacheTable().getColSize());
}
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 93af29c..ec97915 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -148,7 +148,7 @@ sal_uInt32 ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx )
return 0;
}
-sal_Bool ScSheetDPData::getIsDataLayoutDimension(long nColumn)
+bool ScSheetDPData::getIsDataLayoutDimension(long nColumn)
{
CreateCacheTable();
return (nColumn ==(long)( aCacheTable.getColSize()));
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index d8504a5..a1d299b 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -1071,7 +1071,7 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect
nMemberStep = 1;
while ( nPos < ppDim.size() )
{
- if ( ppDim[nPos] ->getIsDataLayoutDimension() )
+ if ( ppDim[nPos]->getIsDataLayoutDimension() )
{
if ( !pChildDimension )
pChildDimension = new ScDPResultDimension( pResultData );
@@ -1115,7 +1115,7 @@ void ScDPResultMember::LateInitFrom(
nMemberStep = 1;
while ( !rParams.IsEnd( nPos ) )
{
- if ( rParams.GetDim( nPos ) ->getIsDataLayoutDimension() )
+ if ( rParams.GetDim( nPos )->getIsDataLayoutDimension() )
{
if ( !pChildDimension )
pChildDimension = new ScDPResultDimension( pResultData );
commit ca6e816ed9c10521bda250a8898a0aaadcd28a05
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 13:32:25 2014 +0200
sal_Bool->bool
Change-Id: I707536b04c2e27fcb7d6283baee3479fe0fa67cd
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index ba4ff07..87af3be 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -170,15 +170,15 @@ public:
ScDPDimension* GetDataDimension(long nIndex);
OUString GetDataDimName(long nIndex);
const ScDPCache* GetCache();
- const ScDPItemData* GetItemDataById( long nDim, long nId );
- long GetDataLayoutDim(){ return pData->GetColumnCount(); }
- SCROW GetMemberId( long nDim, const ScDPItemData& rData );
- sal_Bool IsDataLayoutDimension(long nDim);
+ const ScDPItemData* GetItemDataById( long nDim, long nId );
+ long GetDataLayoutDim(){ return pData->GetColumnCount(); }
+ SCROW GetMemberId( long nDim, const ScDPItemData& rData );
+ bool IsDataLayoutDimension(long nDim);
sal_uInt16 GetDataLayoutOrientation();
- sal_Bool IsDateDimension(long nDim);
+ bool IsDateDimension(long nDim);
- sal_Bool SubTotalAllowed(long nColumn); //! move to ScDPResultData
+ bool SubTotalAllowed(long nColumn); //! move to ScDPResultData
ScDPDimension* AddDuplicated(long nSource, const OUString& rNewName);
long GetDupCount() const { return nDupCount; }
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 947bc1b..82a0c1d 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -255,7 +255,7 @@ void removeDim( long nRemove, std::vector<long>& rDims )
}
-sal_Bool ScDPSource::SubTotalAllowed(long nColumn)
+bool ScDPSource::SubTotalAllowed(long nColumn)
{
//! cache this at ScDPResultData
bool bAllowed = true;
@@ -300,7 +300,7 @@ void ScDPSource::SetOrientation(long nColumn, sal_uInt16 nNew)
}
}
-sal_Bool ScDPSource::IsDataLayoutDimension(long nDim)
+bool ScDPSource::IsDataLayoutDimension(long nDim)
{
return nDim == pData->GetColumnCount();
}
@@ -310,7 +310,7 @@ sal_uInt16 ScDPSource::GetDataLayoutOrientation()
return GetOrientation(pData->GetColumnCount());
}
-sal_Bool ScDPSource::IsDateDimension(long nDim)
+bool ScDPSource::IsDateDimension(long nDim)
{
return pData->IsDateDimension(nDim);
}
commit f40c11f11e0c241c5437709d302407a2fe61e2f9
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 12:55:11 2014 +0200
sal_Bool->bool
Change-Id: I4fb9f453c5e0069ec12076547c95a6bbe441a2e2
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index e6f53f7..ff193cd 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -130,7 +130,7 @@ public:
void UpdateAllRowHeights();
void BeforeXMLLoading();
- void AfterXMLLoading(sal_Bool bRet);
+ void AfterXMLLoading(bool bRet);
ScSheetSaveData* GetSheetSaveData();
void RepaintRange( const ScRange& rRange );
@@ -842,7 +842,7 @@ private:
ScDocShell* pDocShell;
SCTAB nTab;
- sal_Bool GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex );
+ bool GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex );
ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex);
ScTableSheetObj* GetObjectByName_Impl(const OUString& aName);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 89cb922..e91fd9e 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -424,7 +424,7 @@ void ScModelObj::BeforeXMLLoading()
pDocShell->BeforeXMLLoading();
}
-void ScModelObj::AfterXMLLoading(sal_Bool bRet)
+void ScModelObj::AfterXMLLoading(bool bRet)
{
if (pDocShell)
pDocShell->AfterXMLLoading(bRet);
@@ -3670,7 +3670,7 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
// XScenarios
-sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex )
+bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rIndex )
{
//! Case-insensitiv ????
@@ -3684,7 +3684,7 @@ sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const OUString& rName, SCTAB& rI
if (aTabName.equals(rName))
{
rIndex = i;
- return sal_True;
+ return true;
}
}
commit 698de0864f3a6df9d6ac2289029b56ae42a1d19c
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 12:37:17 2014 +0200
remove unused parameter
Change-Id: I24d4cb8b7b30c01e6dd5ba8f5e6690a60e6d9470
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index cacc9ee..7b3f7e3 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -44,7 +44,7 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool
static sal_uInt16* pVersionMap12;
public:
- ScDocumentPool( SfxItemPool* pSecPool = NULL, sal_Bool bLoadRefCounts = false );
+ ScDocumentPool( SfxItemPool* pSecPool = NULL );
protected:
virtual ~ScDocumentPool();
public:
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 14aa2cc..28e40ba 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -187,11 +187,11 @@ static SfxItemInfo const aItemInfos[] =
// -----------------------------------------------------------------------
-ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts )
+ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
: SfxItemPool ( OUString("ScDocumentPool"),
ATTR_STARTINDEX, ATTR_ENDINDEX,
- aItemInfos, NULL, bLoadRefCounts ),
+ aItemInfos, NULL, false/*bLoadRefCounts*/ ),
pSecondary ( pSecPool )
{
// latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead
commit 985c6b45afd00791cafaab89240ea5678119436c
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 12:22:54 2014 +0200
sal_Bool->bool
Change-Id: I7176217c4b9593386209db2fba8f26f45c39c5ca
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index a1b39d8..0406de0 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -31,7 +31,7 @@
class SC_DLLPUBLIC ScDocOptions
{
- double fIterEps; // epsilon value dazu
+ double fIterEps; // epsilon value dazu
sal_uInt16 nIterCount; ///< number
sal_uInt16 nPrecStandardFormat; ///< precision for standard format
sal_uInt16 nDay; ///< Null date:
@@ -39,32 +39,32 @@ class SC_DLLPUBLIC ScDocOptions
sal_uInt16 nYear;
sal_uInt16 nYear2000; ///< earlier 19YY is assumed, 20YY otherwise (if only YY of year is given)
sal_uInt16 nTabDistance; ///< distance of standard tabs
- sal_Bool bIsIgnoreCase; ///< ignore case for comparisons?
- sal_Bool bIsIter; ///< iterations for circular refs
- sal_Bool bCalcAsShown; ///< calculate as shown (wrt precision)
- sal_Bool bMatchWholeCell; ///< search criteria must match the whole cell
- sal_Bool bDoAutoSpell; ///< auto-spelling
- sal_Bool bLookUpColRowNames; ///< determine column-/row titles automagically
- sal_Bool bFormulaRegexEnabled; ///< regular expressions in formulas enabled
+ bool bIsIgnoreCase; ///< ignore case for comparisons?
+ bool bIsIter; ///< iterations for circular refs
+ bool bCalcAsShown; ///< calculate as shown (wrt precision)
+ bool bMatchWholeCell; ///< search criteria must match the whole cell
+ bool bDoAutoSpell; ///< auto-spelling
+ bool bLookUpColRowNames; ///< determine column-/row titles automagically
+ bool bFormulaRegexEnabled; ///< regular expressions in formulas enabled
public:
ScDocOptions();
ScDocOptions( const ScDocOptions& rCpy );
~ScDocOptions();
- sal_Bool IsLookUpColRowNames() const { return bLookUpColRowNames; }
- void SetLookUpColRowNames( sal_Bool bVal ) { bLookUpColRowNames = bVal; }
- sal_Bool IsAutoSpell() const { return bDoAutoSpell; }
- void SetAutoSpell( sal_Bool bVal ) { bDoAutoSpell = bVal; }
- sal_Bool IsMatchWholeCell() const { return bMatchWholeCell; }
- void SetMatchWholeCell( sal_Bool bVal ){ bMatchWholeCell = bVal; }
- sal_Bool IsIgnoreCase() const { return bIsIgnoreCase; }
- void SetIgnoreCase( sal_Bool bVal ) { bIsIgnoreCase = bVal; }
- sal_Bool IsIter() const { return bIsIter; }
- void SetIter( sal_Bool bVal ) { bIsIter = bVal; }
+ bool IsLookUpColRowNames() const { return bLookUpColRowNames; }
+ void SetLookUpColRowNames( bool bVal ) { bLookUpColRowNames = bVal; }
+ bool IsAutoSpell() const { return bDoAutoSpell; }
+ void SetAutoSpell( bool bVal ) { bDoAutoSpell = bVal; }
+ bool IsMatchWholeCell() const { return bMatchWholeCell; }
+ void SetMatchWholeCell( bool bVal ) { bMatchWholeCell = bVal; }
+ bool IsIgnoreCase() const { return bIsIgnoreCase; }
+ void SetIgnoreCase( bool bVal ) { bIsIgnoreCase = bVal; }
+ bool IsIter() const { return bIsIter; }
+ void SetIter( bool bVal ) { bIsIter = bVal; }
sal_uInt16 GetIterCount() const { return nIterCount; }
void SetIterCount( sal_uInt16 nCount) { nIterCount = nCount; }
- double GetIterEps() const { return fIterEps; }
- void SetIterEps( double fEps ) { fIterEps = fEps; }
+ double GetIterEps() const { return fIterEps; }
+ void SetIterEps( double fEps ) { fIterEps = fEps; }
void GetDate( sal_uInt16& rD, sal_uInt16& rM, sal_uInt16& rY ) const
{ rD = nDay; rM = nMonth; rY = nYear;}
@@ -79,17 +79,17 @@ public:
inline bool operator==( const ScDocOptions& rOpt ) const;
inline bool operator!=( const ScDocOptions& rOpt ) const;
- sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; }
+ sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; }
void SetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; }
- sal_Bool IsCalcAsShown() const { return bCalcAsShown; }
- void SetCalcAsShown( sal_Bool bVal ) { bCalcAsShown = bVal; }
+ bool IsCalcAsShown() const { return bCalcAsShown; }
+ void SetCalcAsShown( bool bVal ) { bCalcAsShown = bVal; }
void SetYear2000( sal_uInt16 nVal ) { nYear2000 = nVal; }
sal_uInt16 GetYear2000() const { return nYear2000; }
- void SetFormulaRegexEnabled( sal_Bool bVal ) { bFormulaRegexEnabled = bVal; }
- sal_Bool IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
+ void SetFormulaRegexEnabled( bool bVal ) { bFormulaRegexEnabled = bVal; }
+ bool IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
};
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index d2075ee..c2f22d8 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -782,7 +782,7 @@ void ImportExcel::ReadUsesElfs()
if( maStrm.ReaduInt16() != 0 )
{
ScDocOptions aDocOpt = GetDoc().GetDocOptions();
- aDocOpt.SetLookUpColRowNames( sal_True );
+ aDocOpt.SetLookUpColRowNames( true );
GetDoc().SetDocOptions( aDocOpt );
}
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index edab77d..8995933 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2989,7 +2989,7 @@ sal_Bool ScViewData::UpdateFixY( SCTAB nTab ) // sal_True = Wert g
void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const
{
ScDocument* pLocalDoc = GetDocument();
- sal_Bool bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell();
+ bool bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell();
sal_uLong nCntrl = rOutl.GetControlWord();
nCntrl |= EE_CNTRL_URLSFXEXECUTE;
commit cc66810df37225f9758ca09f2e6280bbe1a81f32
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 10 12:09:19 2014 +0200
sal_Bool->bool
Change-Id: I55d0b09ab4e60a4725314691b2d9c170cd60e179
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index 2676e7d..eef1481 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -106,7 +106,7 @@ class ScDispatch : public cppu::WeakImplHelper2<
ScTabViewShell* pViewShell;
XStatusListenerArr_Impl aDataSourceListeners;
ScImportParam aLastImport;
- sal_Bool bListeningToView;
+ bool bListeningToView;
public:
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 787a1d2..496a3d5 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -301,7 +301,7 @@ void SAL_CALL ScDispatch::addStatusListener(
uno::Reference<view::XSelectionSupplier> xSupplier(lcl_GetSelectionSupplier( pViewShell ));
if ( xSupplier.is() )
xSupplier->addSelectionChangeListener(this);
- bListeningToView = sal_True;
+ bListeningToView = true;
}
ScDBData* pDBData = pViewShell->GetDBData(false,SC_DB_OLD);
More information about the Libreoffice-commits
mailing list