mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Bool->bool

Browse Source 
Change-Id: If8d90d507e29caaf8ceb41deb9cb5eb54476773e
This commit is contained in:
Noel Grandin
2014-02-19 14:13:11 +02:00
parent 8be2cbc856
commit 87612bfee4
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editeng/source/misc/acorrcfg.cxx
View File

@@ -40,12 +40,12 @@ using namespace com::sun::star::uno;
SvxAutoCorrCfg::SvxAutoCorrCfg() : SvxAutoCorrCfg::SvxAutoCorrCfg() :
aBaseConfig(*this), aBaseConfig(*this),
aSwConfig(*this), aSwConfig(*this),
bFileRel(sal_True), bFileRel(true),
bNetRel(sal_True), bNetRel(true),
bAutoTextTip(sal_True), bAutoTextTip(true),
bAutoTextPreview(sal_False), bAutoTextPreview(false),
bAutoFmtByInput(sal_True), bAutoFmtByInput(true),
bSearchInAllCategories(sal_False) bSearchInAllCategories(false)
{ {
SvtPathOptions aPathOpt; SvtPathOptions aPathOpt;
OUString sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() ); OUString sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
@@ -68,8 +68,8 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
} }
pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath );
aBaseConfig.Load(sal_True); aBaseConfig.Load(true);
aSwConfig.Load(sal_True); aSwConfig.Load(true);
} }
SvxAutoCorrCfg::~SvxAutoCorrCfg() SvxAutoCorrCfg::~SvxAutoCorrCfg()
@@ -122,7 +122,7 @@ Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames()
return aNames; return aNames;
} }
void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) void SvxBaseAutoCorrCfg::Load(bool bInit)
{ {
Sequence<OUString> aNames = GetPropertyNames(); Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames); Sequence<Any> aValues = GetProperties(aNames);
@@ -325,7 +325,7 @@ void SvxBaseAutoCorrCfg::Commit()
void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */) void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */)
{ {
Load(sal_False); Load(false);
} }
Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames() Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames()
@@ -388,7 +388,7 @@ Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames()
return aNames; return aNames;
} }
void SvxSwAutoCorrCfg::Load(sal_Bool bInit) void SvxSwAutoCorrCfg::Load(bool bInit)
{ {
Sequence<OUString> aNames = GetPropertyNames(); Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames); Sequence<Any> aValues = GetProperties(aNames);
@@ -644,7 +644,7 @@ void SvxSwAutoCorrCfg::Commit()
void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ ) void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ )
{ {
Load(sal_False); Load(false);
} }
namespace namespace

40
include/editeng/acorrcfg.hxx
View File

@@ -33,7 +33,7 @@ public:
SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent); SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent);
~SvxBaseAutoCorrCfg(); ~SvxBaseAutoCorrCfg();
void Load(sal_Bool bInit); void Load(bool bInit);
virtual void Commit(); virtual void Commit();
virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
void SetModified() {ConfigItem::SetModified();} void SetModified() {ConfigItem::SetModified();}
@@ -48,7 +48,7 @@ public:
SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent); SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent);
~SvxSwAutoCorrCfg(); ~SvxSwAutoCorrCfg();
void Load(sal_Bool bInit); void Load(bool bInit);
virtual void Commit(); virtual void Commit();
virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
void SetModified() {ConfigItem::SetModified();} void SetModified() {ConfigItem::SetModified();}
@@ -67,13 +67,13 @@ class EDITENG_DLLPUBLIC SvxAutoCorrCfg
SvxSwAutoCorrCfg aSwConfig; SvxSwAutoCorrCfg aSwConfig;
// Flags for Autotext: // Flags for Autotext:
sal_Bool bFileRel; bool bFileRel;
sal_Bool bNetRel; bool bNetRel;
// Help tip for Autotext as you type // Help tip for Autotext as you type
sal_Bool bAutoTextTip; bool bAutoTextTip;
sal_Bool bAutoTextPreview; bool bAutoTextPreview;
sal_Bool bAutoFmtByInput; bool bAutoFmtByInput;
sal_Bool bSearchInAllCategories; bool bSearchInAllCategories;
public: public:
void SetModified() void SetModified()
@@ -92,23 +92,23 @@ public:
// the pointer is transferred to the possession of the ConfigItems! // the pointer is transferred to the possession of the ConfigItems!
void SetAutoCorrect( SvxAutoCorrect* ); void SetAutoCorrect( SvxAutoCorrect* );
sal_Bool IsAutoFmtByInput() const { return bAutoFmtByInput; } bool IsAutoFmtByInput() const { return bAutoFmtByInput; }
void SetAutoFmtByInput( sal_Bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();} void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
sal_Bool IsSaveRelFile() const { return bFileRel; } bool IsSaveRelFile() const { return bFileRel; }
void SetSaveRelFile( sal_Bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); } void SetSaveRelFile( bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); }
sal_Bool IsSaveRelNet() const { return bNetRel; } bool IsSaveRelNet() const { return bNetRel; }
void SetSaveRelNet( sal_Bool bSet ) { bNetRel = bSet; aSwConfig.SetModified();} void SetSaveRelNet( bool bSet ) { bNetRel = bSet; aSwConfig.SetModified();}
sal_Bool IsAutoTextPreview() const {return bAutoTextPreview;} bool IsAutoTextPreview() const {return bAutoTextPreview;}
void SetAutoTextPreview(sal_Bool bSet) {bAutoTextPreview = bSet; aSwConfig.SetModified();} void SetAutoTextPreview(bool bSet) {bAutoTextPreview = bSet; aSwConfig.SetModified();}
sal_Bool IsAutoTextTip() const { return bAutoTextTip; } bool IsAutoTextTip() const { return bAutoTextTip; }
void SetAutoTextTip(sal_Bool bSet ) { bAutoTextTip = bSet;aSwConfig.SetModified();} void SetAutoTextTip(bool bSet ) { bAutoTextTip = bSet;aSwConfig.SetModified();}
sal_Bool IsSearchInAllCategories() const { return bSearchInAllCategories;} bool IsSearchInAllCategories() const { return bSearchInAllCategories;}
void SetSearchInAllCategories(sal_Bool bSet ) { bSearchInAllCategories = bSet; aSwConfig.SetModified(); } void SetSearchInAllCategories(bool bSet ) { bSearchInAllCategories = bSet; aSwConfig.SetModified(); }
SvxAutoCorrCfg(); SvxAutoCorrCfg();
virtual ~SvxAutoCorrCfg(); virtual ~SvxAutoCorrCfg();

2
sw/source/ui/shells/textsh1.cxx
View File

@@ -667,7 +667,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
case FN_AUTOFORMAT_AUTO: case FN_AUTOFORMAT_AUTO:
{ {
SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); 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() ) if( bSet != rACfg.IsAutoFmtByInput() )
{ {
rACfg.SetAutoFmtByInput( bSet ); rACfg.SetAutoFmtByInput( bSet );