diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-11 15:32:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-12 09:01:09 +0200 |
commit | c04fa61cf3e793b497d55003821ce9fd16be8728 (patch) | |
tree | 8f887b01882fd5514b9dad3a75d0a864398fef8c | |
parent | 49b78a5d67cf808736497f888163bfb10cffec3b (diff) |
sal_Bool->bool
Change-Id: I9d2b6313b8ae2b02286ed42254a292a853904b81
-rw-r--r-- | sc/inc/editutil.hxx | 14 | ||||
-rw-r--r-- | sc/source/core/tool/editutil.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/unoobj/editsrc.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 21cf64388631..b107f7ff2eeb 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -135,17 +135,17 @@ public: /// bDeleteEnginePool: Engine becomes the owner of the pool /// and deletes it on destruction ScEditEngineDefaulter( SfxItemPool* pEnginePool, - sal_Bool bDeleteEnginePool = false ); + bool bDeleteEnginePool = false ); /// If rOrg.bDeleteEnginePool: pool gets cloned and will be /// deleted on destruction. Defaults are not set. ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg ); virtual ~ScEditEngineDefaulter(); /// 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 - 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 /// if it doesn't exist yet. @@ -159,19 +159,19 @@ public: void SetText( const EditTextObject& rTextObject ); /// Current defaults are not applied, new defaults are applied 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 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 void SetText( const OUString& rText ); /// Current defaults are not applied, new defaults are applied 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 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 /// character attributes and all paragraph attributes reset diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 6a1ceeb91205..a96c6de54959 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -459,7 +459,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper() } ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP, - sal_Bool bDeleteEnginePoolP ) + bool bDeleteEnginePoolP ) : ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ), EditEngine( pEnginePoolP ) @@ -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 ) { @@ -508,7 +508,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem EnableUndo( sal_True ); } -void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, sal_Bool bTakeOwnership ) +void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, bool bTakeOwnership ) { if ( bDeleteDefaults ) delete pDefaults; @@ -552,7 +552,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject ) } void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject, - const SfxItemSet& rSet, sal_Bool bRememberCopy ) + const SfxItemSet& rSet, bool bRememberCopy ) { sal_Bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) @@ -564,7 +564,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec } void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject, - SfxItemSet* pSet, sal_Bool bTakeOwnership ) + SfxItemSet* pSet, bool bTakeOwnership ) { sal_Bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) @@ -588,7 +588,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText ) } void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText, - const SfxItemSet& rSet, sal_Bool bRememberCopy ) + const SfxItemSet& rSet, bool bRememberCopy ) { sal_Bool bUpdateMode = GetUpdateMode(); if ( bUpdateMode ) @@ -600,7 +600,7 @@ 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(); if ( bUpdateMode ) diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 650280f857b8..a84b71788d74 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder() { SfxItemPool* pEnginePool = EditEngine::CreatePool(); pEnginePool->FreezeIdRanges(); - pEditEngine = new ScEditEngineDefaulter( pEnginePool, sal_True ); + pEditEngine = new ScEditEngineDefaulter( pEnginePool, true ); } pForwarder = new SvxEditEngineForwarder(*pEditEngine); } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 56f227de8b16..c5f0ab0b36ca 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -940,7 +940,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, else { // use EditEngine to draw mixed-script string - pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True ); + pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), true ); pEditEng->SetRefMapMode( pContentDev->GetMapMode() ); SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() ); rDefPattern.FillEditItemSet( pEditDefaults ); |