diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 04942ae9be09..4ec25e270b6a 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -40,12 +40,12 @@ using namespace com::sun::star::uno; SvxAutoCorrCfg::SvxAutoCorrCfg() : aBaseConfig(*this), aSwConfig(*this), - bFileRel(sal_True), - bNetRel(sal_True), - bAutoTextTip(sal_True), - bAutoTextPreview(sal_False), - bAutoFmtByInput(sal_True), - bSearchInAllCategories(sal_False) + bFileRel(true), + bNetRel(true), + bAutoTextTip(true), + bAutoTextPreview(false), + bAutoFmtByInput(true), + bSearchInAllCategories(false) { SvtPathOptions aPathOpt; OUString sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() ); @@ -68,8 +68,8 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : } pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); - aBaseConfig.Load(sal_True); - aSwConfig.Load(sal_True); + aBaseConfig.Load(true); + aSwConfig.Load(true); } SvxAutoCorrCfg::~SvxAutoCorrCfg() @@ -122,7 +122,7 @@ Sequence SvxBaseAutoCorrCfg::GetPropertyNames() return aNames; } -void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) +void SvxBaseAutoCorrCfg::Load(bool bInit) { Sequence aNames = GetPropertyNames(); Sequence aValues = GetProperties(aNames); @@ -325,7 +325,7 @@ void SvxBaseAutoCorrCfg::Commit() void SvxBaseAutoCorrCfg::Notify( const Sequence& /* aPropertyNames */) { - Load(sal_False); + Load(false); } Sequence SvxSwAutoCorrCfg::GetPropertyNames() @@ -388,7 +388,7 @@ Sequence SvxSwAutoCorrCfg::GetPropertyNames() return aNames; } -void SvxSwAutoCorrCfg::Load(sal_Bool bInit) +void SvxSwAutoCorrCfg::Load(bool bInit) { Sequence aNames = GetPropertyNames(); Sequence aValues = GetProperties(aNames); @@ -644,7 +644,7 @@ void SvxSwAutoCorrCfg::Commit() void SvxSwAutoCorrCfg::Notify( const Sequence& /* aPropertyNames */ ) { - Load(sal_False); + Load(false); } namespace diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index 67cc2ca4a91a..974e7a7e1496 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -33,7 +33,7 @@ public: SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent); ~SvxBaseAutoCorrCfg(); - void Load(sal_Bool bInit); + void Load(bool bInit); virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); void SetModified() {ConfigItem::SetModified();} @@ -48,7 +48,7 @@ public: SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent); ~SvxSwAutoCorrCfg(); - void Load(sal_Bool bInit); + void Load(bool bInit); virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); void SetModified() {ConfigItem::SetModified();} @@ -67,13 +67,13 @@ class EDITENG_DLLPUBLIC SvxAutoCorrCfg SvxSwAutoCorrCfg aSwConfig; // Flags for Autotext: - sal_Bool bFileRel; - sal_Bool bNetRel; + bool bFileRel; + bool bNetRel; // Help tip for Autotext as you type - sal_Bool bAutoTextTip; - sal_Bool bAutoTextPreview; - sal_Bool bAutoFmtByInput; - sal_Bool bSearchInAllCategories; + bool bAutoTextTip; + bool bAutoTextPreview; + bool bAutoFmtByInput; + bool bSearchInAllCategories; public: void SetModified() @@ -92,23 +92,23 @@ public: // the pointer is transferred to the possession of the ConfigItems! void SetAutoCorrect( SvxAutoCorrect* ); - sal_Bool IsAutoFmtByInput() const { return bAutoFmtByInput; } - void SetAutoFmtByInput( sal_Bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();} + bool IsAutoFmtByInput() const { return bAutoFmtByInput; } + void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();} - sal_Bool IsSaveRelFile() const { return bFileRel; } - void SetSaveRelFile( sal_Bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); } + bool IsSaveRelFile() const { return bFileRel; } + void SetSaveRelFile( bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); } - sal_Bool IsSaveRelNet() const { return bNetRel; } - void SetSaveRelNet( sal_Bool bSet ) { bNetRel = bSet; aSwConfig.SetModified();} + bool IsSaveRelNet() const { return bNetRel; } + void SetSaveRelNet( bool bSet ) { bNetRel = bSet; aSwConfig.SetModified();} - sal_Bool IsAutoTextPreview() const {return bAutoTextPreview;} - void SetAutoTextPreview(sal_Bool bSet) {bAutoTextPreview = bSet; aSwConfig.SetModified();} + bool IsAutoTextPreview() const {return bAutoTextPreview;} + void SetAutoTextPreview(bool bSet) {bAutoTextPreview = bSet; aSwConfig.SetModified();} - sal_Bool IsAutoTextTip() const { return bAutoTextTip; } - void SetAutoTextTip(sal_Bool bSet ) { bAutoTextTip = bSet;aSwConfig.SetModified();} + bool IsAutoTextTip() const { return bAutoTextTip; } + void SetAutoTextTip(bool bSet ) { bAutoTextTip = bSet;aSwConfig.SetModified();} - sal_Bool IsSearchInAllCategories() const { return bSearchInAllCategories;} - void SetSearchInAllCategories(sal_Bool bSet ) { bSearchInAllCategories = bSet; aSwConfig.SetModified(); } + bool IsSearchInAllCategories() const { return bSearchInAllCategories;} + void SetSearchInAllCategories(bool bSet ) { bSearchInAllCategories = bSet; aSwConfig.SetModified(); } SvxAutoCorrCfg(); virtual ~SvxAutoCorrCfg(); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 177bd892aa92..59df37ecd9ab 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -667,7 +667,7 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_AUTOFORMAT_AUTO: { SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); - sal_Bool bSet = pItem ? ((const SfxBoolItem*)pItem)->GetValue() : !rACfg.IsAutoFmtByInput(); + bool bSet = pItem ? ((const SfxBoolItem*)pItem)->GetValue() : !rACfg.IsAutoFmtByInput(); if( bSet != rACfg.IsAutoFmtByInput() ) { rACfg.SetAutoFmtByInput( bSet );