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

sal_Bool->bool

Change-Id: I9d2b6313b8ae2b02286ed42254a292a853904b81
üst 49b78a5d
...@@ -135,17 +135,17 @@ public: ...@@ -135,17 +135,17 @@ public:
/// bDeleteEnginePool: Engine becomes the owner of the pool /// bDeleteEnginePool: Engine becomes the owner of the pool
/// and deletes it on destruction /// and deletes it on destruction
ScEditEngineDefaulter( SfxItemPool* pEnginePool, ScEditEngineDefaulter( SfxItemPool* pEnginePool,
sal_Bool bDeleteEnginePool = false ); bool bDeleteEnginePool = false );
/// If rOrg.bDeleteEnginePool: pool gets cloned and will be /// If rOrg.bDeleteEnginePool: pool gets cloned and will be
/// deleted on destruction. Defaults are not set. /// deleted on destruction. Defaults are not set.
ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg ); ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg );
virtual ~ScEditEngineDefaulter(); virtual ~ScEditEngineDefaulter();
/// Creates a copy of SfxItemSet if bRememberCopy set /// Creates a copy of SfxItemSet if bRememberCopy set
void SetDefaults( const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); void SetDefaults( const SfxItemSet& rDefaults, bool bRememberCopy = true );
/// Becomes the owner of the SfxItemSet if bTakeOwnership set /// Becomes the owner of the SfxItemSet if bTakeOwnership set
void SetDefaults( SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); void SetDefaults( SfxItemSet* pDefaults, bool bTakeOwnership = true );
/// Set the item in the default ItemSet which is created /// Set the item in the default ItemSet which is created
/// if it doesn't exist yet. /// if it doesn't exist yet.
...@@ -159,19 +159,19 @@ public: ...@@ -159,19 +159,19 @@ public:
void SetText( const EditTextObject& rTextObject ); void SetText( const EditTextObject& rTextObject );
/// Current defaults are not applied, new defaults are applied /// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const EditTextObject& rTextObject, void SetTextNewDefaults( const EditTextObject& rTextObject,
const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); const SfxItemSet& rDefaults, bool bRememberCopy = true );
/// Current defaults are not applied, new defaults are applied /// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const EditTextObject& rTextObject, void SetTextNewDefaults( const EditTextObject& rTextObject,
SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); SfxItemSet* pDefaults, bool bTakeOwnership = true );
/// Overwritten method to be able to apply defaults already set /// Overwritten method to be able to apply defaults already set
void SetText( const OUString& rText ); void SetText( const OUString& rText );
/// Current defaults are not applied, new defaults are applied /// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const OUString& rText, void SetTextNewDefaults( const OUString& rText,
const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True ); const SfxItemSet& rDefaults, bool bRememberCopy = true );
/// Current defaults are not applied, new defaults are applied /// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const OUString& rText, void SetTextNewDefaults( const OUString& rText,
SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True ); SfxItemSet* pDefaults, bool bTakeOwnership = true );
/// Paragraph attributes that are not defaults are copied to /// Paragraph attributes that are not defaults are copied to
/// character attributes and all paragraph attributes reset /// character attributes and all paragraph attributes reset
......
...@@ -459,7 +459,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper() ...@@ -459,7 +459,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper()
} }
ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP, ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP,
sal_Bool bDeleteEnginePoolP ) bool bDeleteEnginePoolP )
: :
ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ), ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ),
EditEngine( pEnginePoolP ) EditEngine( pEnginePoolP )
...@@ -482,7 +482,7 @@ ScEditEngineDefaulter::~ScEditEngineDefaulter() ...@@ -482,7 +482,7 @@ ScEditEngineDefaulter::~ScEditEngineDefaulter()
{ {
} }
void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRememberCopy ) void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, bool bRememberCopy )
{ {
if ( bRememberCopy ) if ( bRememberCopy )
{ {
...@@ -508,7 +508,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem ...@@ -508,7 +508,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem
EnableUndo( sal_True ); EnableUndo( sal_True );
} }
void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, sal_Bool bTakeOwnership ) void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, bool bTakeOwnership )
{ {
if ( bDeleteDefaults ) if ( bDeleteDefaults )
delete pDefaults; delete pDefaults;
...@@ -552,7 +552,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject ) ...@@ -552,7 +552,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
} }
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject, void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
const SfxItemSet& rSet, sal_Bool bRememberCopy ) const SfxItemSet& rSet, bool bRememberCopy )
{ {
sal_Bool bUpdateMode = GetUpdateMode(); sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode ) if ( bUpdateMode )
...@@ -564,7 +564,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec ...@@ -564,7 +564,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
} }
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject, void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
SfxItemSet* pSet, sal_Bool bTakeOwnership ) SfxItemSet* pSet, bool bTakeOwnership )
{ {
sal_Bool bUpdateMode = GetUpdateMode(); sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode ) if ( bUpdateMode )
...@@ -588,7 +588,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText ) ...@@ -588,7 +588,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText )
} }
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
const SfxItemSet& rSet, sal_Bool bRememberCopy ) const SfxItemSet& rSet, bool bRememberCopy )
{ {
sal_Bool bUpdateMode = GetUpdateMode(); sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode ) if ( bUpdateMode )
...@@ -600,7 +600,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, ...@@ -600,7 +600,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
} }
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
SfxItemSet* pSet, sal_Bool bTakeOwnership ) SfxItemSet* pSet, bool bTakeOwnership )
{ {
sal_Bool bUpdateMode = GetUpdateMode(); sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode ) if ( bUpdateMode )
......
...@@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder() ...@@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
{ {
SfxItemPool* pEnginePool = EditEngine::CreatePool(); SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges(); pEnginePool->FreezeIdRanges();
pEditEngine = new ScEditEngineDefaulter( pEnginePool, sal_True ); pEditEngine = new ScEditEngineDefaulter( pEnginePool, true );
} }
pForwarder = new SvxEditEngineForwarder(*pEditEngine); pForwarder = new SvxEditEngineForwarder(*pEditEngine);
} }
......
...@@ -940,7 +940,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ...@@ -940,7 +940,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
else else
{ {
// use EditEngine to draw mixed-script string // use EditEngine to draw mixed-script string
pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True ); pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), true );
pEditEng->SetRefMapMode( pContentDev->GetMapMode() ); pEditEng->SetRefMapMode( pContentDev->GetMapMode() );
SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() ); SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() );
rDefPattern.FillEditItemSet( pEditDefaults ); rDefPattern.FillEditItemSet( pEditDefaults );
......
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