Kaydet (Commit) 04935907 authored tarafından Noel Grandin's avatar Noel Grandin

sal_Bool->bool

Change-Id: I5b36c8dbefb63ee84d33e9bf1a472c2bbb8b34f0
üst c04fa61c
...@@ -238,7 +238,7 @@ private: ...@@ -238,7 +238,7 @@ private:
ScHeaderFieldData aData; ScHeaderFieldData aData;
public: public:
ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = false ); ScHeaderEditEngine( SfxItemPool* pEnginePool, bool bDeleteEnginePool = false );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; }
......
...@@ -246,7 +246,7 @@ void ScStyleSheetPool::CreateStandardStyles() ...@@ -246,7 +246,7 @@ void ScStyleSheetPool::CreateStandardStyles()
SfxItemSet* pSet = NULL; SfxItemSet* pSet = NULL;
SfxItemSet* pHFSet = NULL; SfxItemSet* pHFSet = NULL;
SvxSetItem* pHFSetItem = NULL; SvxSetItem* pHFSetItem = NULL;
ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True ); ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), true );
pEdEngine->SetUpdateMode( false ); pEdEngine->SetUpdateMode( false );
EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject(); EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject();
EditTextObject* pTxtObj = NULL; EditTextObject* pTxtObj = NULL;
......
...@@ -794,7 +794,7 @@ ScHeaderFieldData::ScHeaderFieldData() ...@@ -794,7 +794,7 @@ ScHeaderFieldData::ScHeaderFieldData()
eNumType = SVX_ARABIC; eNumType = SVX_ARABIC;
} }
ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, sal_Bool bDeleteEnginePoolP ) ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, bool bDeleteEnginePoolP )
: ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP ) : ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
{ {
} }
......
...@@ -352,7 +352,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const ...@@ -352,7 +352,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const
{ {
if( !mrData.mxHFEditEngine.get() ) if( !mrData.mxHFEditEngine.get() )
{ {
mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True ) ); mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), true ) );
ScHeaderEditEngine& rEE = *mrData.mxHFEditEngine; ScHeaderEditEngine& rEE = *mrData.mxHFEditEngine;
rEE.SetRefMapMode( MAP_TWIP ); // headers/footers use twips as default metric rEE.SetRefMapMode( MAP_TWIP ); // headers/footers use twips as default metric
rEE.SetUpdateMode( false ); rEE.SetUpdateMode( false );
......
...@@ -1491,7 +1491,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder() ...@@ -1491,7 +1491,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
{ {
SfxItemPool* pEnginePool = EditEngine::CreatePool(); SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges(); pEnginePool->FreezeIdRanges();
ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, sal_True ); ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, true );
pHdrEngine->EnableUndo( false ); pHdrEngine->EnableUndo( false );
pHdrEngine->SetRefMapMode( MAP_TWIP ); pHdrEngine->SetRefMapMode( MAP_TWIP );
......
...@@ -89,7 +89,7 @@ ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation ...@@ -89,7 +89,7 @@ ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation
Size aSize( GetOutputSize() ); Size aSize( GetOutputSize() );
aSize.Height() *= 4; aSize.Height() *= 4;
pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True ); pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), true );
pEdEngine->SetPaperSize( aSize ); pEdEngine->SetPaperSize( aSize );
pEdEngine->SetRefDevice( this ); pEdEngine->SetRefDevice( this );
......
...@@ -209,7 +209,7 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder() ...@@ -209,7 +209,7 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
{ {
SfxItemPool* pEnginePool = EditEngine::CreatePool(); SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges(); pEnginePool->FreezeIdRanges();
ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, sal_True ); ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, true );
pHdrEngine->EnableUndo( false ); pHdrEngine->EnableUndo( false );
pHdrEngine->SetRefMapMode( MAP_TWIP ); pHdrEngine->SetRefMapMode( MAP_TWIP );
...@@ -349,7 +349,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException ...@@ -349,7 +349,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException
if (pData) if (pData)
{ {
// for pure text, no font info is needed in pool defaults // for pure text, no font info is needed in pool defaults
ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), sal_True ); ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), true );
ScHeaderFieldData aData; ScHeaderFieldData aData;
FillDummyFieldData( aData ); FillDummyFieldData( aData );
......
...@@ -1663,7 +1663,7 @@ void ScPrintFunc::MakeEditEngine() ...@@ -1663,7 +1663,7 @@ void ScPrintFunc::MakeEditEngine()
{ {
// can't use document's edit engine pool here, // can't use document's edit engine pool here,
// because pool must have twips as default metric // because pool must have twips as default metric
pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True ); pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), true );
pEditEngine->EnableUndo(false); pEditEngine->EnableUndo(false);
//fdo#45869 we want text to be positioned as it would be for the the //fdo#45869 we want text to be positioned as it would be for the the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment