summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-09-27 11:13:36 +0200
committerMichael Stahl <mstahl@redhat.com>2012-10-02 14:57:21 +0200
commit2c270eeff422ef93100376ce0717a131d4f3cc2f (patch)
treedce4683f7710fe0805e029ebaa348beef1803f71
parent59e6d18bea73417b2b5cd044d0489f882e847df6 (diff)
sal_Bool->bool in svl::SvtCTLOptions
Change-Id: I824595b6b60d4114f27bf64d8a84f2973f778e39
-rw-r--r--svl/inc/svl/ctloptions.hxx20
-rw-r--r--svl/source/config/ctloptions.cxx74
2 files changed, 47 insertions, 47 deletions
diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 3a0b82603e83..525e8e73a795 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -37,20 +37,20 @@ private:
public:
// bDontLoad is for referencing purposes only
- SvtCTLOptions( sal_Bool bDontLoad = sal_False );
+ SvtCTLOptions( bool bDontLoad = false );
virtual ~SvtCTLOptions();
- void SetCTLFontEnabled( sal_Bool _bEnabled );
- sal_Bool IsCTLFontEnabled() const;
+ void SetCTLFontEnabled( bool _bEnabled );
+ bool IsCTLFontEnabled() const;
- void SetCTLSequenceChecking( sal_Bool _bEnabled );
- sal_Bool IsCTLSequenceChecking() const;
+ void SetCTLSequenceChecking( bool _bEnabled );
+ bool IsCTLSequenceChecking() const;
- void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingRestricted( void ) const;
+ void SetCTLSequenceCheckingRestricted( bool _bEnable );
+ bool IsCTLSequenceCheckingRestricted( void ) const;
- void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingTypeAndReplace() const;
+ void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable );
+ bool IsCTLSequenceCheckingTypeAndReplace() const;
enum CursorMovement
{
@@ -79,7 +79,7 @@ public:
E_CTLSEQUENCECHECKINGRESTRICTED,
E_CTLSEQUENCECHECKINGTYPEANDREPLACE
};
- sal_Bool IsReadOnly(EOption eOption) const;
+ bool IsReadOnly(EOption eOption) const;
};
#endif // _SVTOOLS_CTLOPTIONS_HXX
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index e7cb760cb8be..36d8df1a7507 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -42,20 +42,20 @@ using namespace ::com::sun::star::uno;
class SvtCTLOptions_Impl : public utl::ConfigItem
{
private:
- sal_Bool m_bIsLoaded;
- sal_Bool m_bCTLFontEnabled;
- sal_Bool m_bCTLSequenceChecking;
- sal_Bool m_bCTLRestricted;
- sal_Bool m_bCTLTypeAndReplace;
+ bool m_bIsLoaded;
+ bool m_bCTLFontEnabled;
+ bool m_bCTLSequenceChecking;
+ bool m_bCTLRestricted;
+ bool m_bCTLTypeAndReplace;
SvtCTLOptions::CursorMovement m_eCTLCursorMovement;
SvtCTLOptions::TextNumerals m_eCTLTextNumerals;
- sal_Bool m_bROCTLFontEnabled;
- sal_Bool m_bROCTLSequenceChecking;
- sal_Bool m_bROCTLRestricted;
- sal_Bool m_bROCTLTypeAndReplace;
- sal_Bool m_bROCTLCursorMovement;
- sal_Bool m_bROCTLTextNumerals;
+ bool m_bROCTLFontEnabled;
+ bool m_bROCTLSequenceChecking;
+ bool m_bROCTLRestricted;
+ bool m_bROCTLTypeAndReplace;
+ bool m_bROCTLCursorMovement;
+ bool m_bROCTLTextNumerals;
public:
SvtCTLOptions_Impl();
@@ -65,18 +65,18 @@ public:
virtual void Commit();
void Load();
- sal_Bool IsLoaded() { return m_bIsLoaded; }
- void SetCTLFontEnabled( sal_Bool _bEnabled );
- sal_Bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; }
+ bool IsLoaded() { return m_bIsLoaded; }
+ void SetCTLFontEnabled( bool _bEnabled );
+ bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; }
- void SetCTLSequenceChecking( sal_Bool _bEnabled );
- sal_Bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;}
+ void SetCTLSequenceChecking( bool _bEnabled );
+ bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;}
- void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; }
+ void SetCTLSequenceCheckingRestricted( bool _bEnable );
+ bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; }
- void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; }
+ void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable );
+ bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; }
void SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eMovement );
SvtCTLOptions::CursorMovement
@@ -86,7 +86,7 @@ public:
SvtCTLOptions::TextNumerals
GetCTLTextNumerals() const { return m_eCTLTextNumerals; }
- sal_Bool IsReadOnly(SvtCTLOptions::EOption eOption) const;
+ bool IsReadOnly(SvtCTLOptions::EOption eOption) const;
};
//------------------------------------------------------------------------------
namespace
@@ -95,9 +95,9 @@ namespace
: public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {};
}
//------------------------------------------------------------------------------
-sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
+bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
{
- sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+ bool bReadOnly = CFG_READONLY_DEFAULT;
switch(eOption)
{
case SvtCTLOptions::E_CTLFONT : bReadOnly = m_bROCTLFontEnabled ; break;
@@ -303,7 +303,7 @@ void SvtCTLOptions_Impl::Load()
m_bIsLoaded = sal_True;
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLFontEnabled( bool _bEnabled )
{
if(!m_bROCTLFontEnabled && m_bCTLFontEnabled != _bEnabled)
{
@@ -313,7 +313,7 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
}
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLSequenceChecking( bool _bEnabled )
{
if(!m_bROCTLSequenceChecking && m_bCTLSequenceChecking != _bEnabled)
{
@@ -323,7 +323,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
}
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( bool _bEnabled )
{
if(!m_bROCTLRestricted && m_bCTLRestricted != _bEnabled)
{
@@ -333,7 +333,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled )
}
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( bool _bEnabled )
{
if(!m_bROCTLTypeAndReplace && m_bCTLTypeAndReplace != _bEnabled)
{
@@ -370,7 +370,7 @@ namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; }
// class SvtCTLOptions --------------------------------------------------
-SvtCTLOptions::SvtCTLOptions( sal_Bool bDontLoad )
+SvtCTLOptions::SvtCTLOptions( bool bDontLoad )
{
// Global access, must be guarded (multithreading)
::osl::MutexGuard aGuard( CTLMutex::get() );
@@ -399,49 +399,49 @@ SvtCTLOptions::~SvtCTLOptions()
DELETEZ( pCTLOptions );
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLFontEnabled( sal_Bool _bEnabled )
+void SvtCTLOptions::SetCTLFontEnabled( bool _bEnabled )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLFontEnabled( _bEnabled );
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLFontEnabled() const
+bool SvtCTLOptions::IsCTLFontEnabled() const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLFontEnabled();
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLSequenceChecking( sal_Bool _bEnabled )
+void SvtCTLOptions::SetCTLSequenceChecking( bool _bEnabled )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLSequenceChecking(_bEnabled);
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLSequenceChecking() const
+bool SvtCTLOptions::IsCTLSequenceChecking() const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLSequenceChecking();
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLSequenceCheckingRestricted( sal_Bool _bEnable )
+void SvtCTLOptions::SetCTLSequenceCheckingRestricted( bool _bEnable )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLSequenceCheckingRestricted(_bEnable);
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const
+bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLSequenceCheckingRestricted();
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable )
+void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( bool _bEnable )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLSequenceCheckingTypeAndReplace(_bEnable);
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const
+bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLSequenceCheckingTypeAndReplace();
@@ -471,7 +471,7 @@ SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() const
return pCTLOptions->GetCTLTextNumerals();
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const
+bool SvtCTLOptions::IsReadOnly(EOption eOption) const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsReadOnly(eOption);