summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-21 17:17:12 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-21 18:24:03 +0100
commit101e5cc49c413bede477c0f44b2256e087f7db8c (patch)
treed0a2150de095e7f4465623102d910db6cc9ed7f6
parentb184636e1ccbc6560430a6a3e44fe56d2014c8f7 (diff)
bool improvements
Change-Id: I85faf4e3fcab6763af11eb6a4082820e88bea1ca
-rw-r--r--include/svtools/editbrowsebox.hxx4
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx6
-rw-r--r--svtools/source/config/menuoptions.cxx2
-rw-r--r--svtools/source/config/miscopt.cxx2
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx4
5 files changed, 9 insertions, 9 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 6d36aeaa8267..900222d8c60b 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -87,7 +87,7 @@ namespace svt
protected:
Control* pWindow;
- sal_Bool bSuspended; // <sal_True> if the window is hidden and disabled
+ bool bSuspended; // <true> if the window is hidden and disabled
public:
TYPEINFO();
@@ -108,7 +108,7 @@ namespace svt
// suspending the controller is not culmulative!
void suspend( );
void resume( );
- inline sal_Bool isSuspended( ) const { return bSuspended; }
+ inline bool isSuspended( ) const { return bSuspended; }
protected:
virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const;
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 6488120b3b30..72cad0faafa2 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1339,7 +1339,7 @@ namespace svt
//------------------------------------------------------------------------------
CellController::CellController(Control* pW)
:pWindow( pW )
- ,bSuspended( sal_True )
+ ,bSuspended( true )
{
DBG_CTOR(CellController,NULL);
@@ -1363,7 +1363,7 @@ namespace svt
CommitModifications();
GetWindow().Hide( );
GetWindow().Disable( );
- bSuspended = sal_True;
+ bSuspended = true;
}
}
@@ -1375,7 +1375,7 @@ namespace svt
{
GetWindow().Enable( );
GetWindow().Show( );
- bSuspended = sal_False;
+ bSuspended = false;
}
}
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 1a320b18e4ab..8089c5c912d3 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -280,7 +280,7 @@ SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
{
// Flush data to configuration!
// User has no chance to do that.
- if( IsModified() == sal_True )
+ if( IsModified() )
{
Commit();
}
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 3a600333ada7..555a9d4a8bf8 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -404,7 +404,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
SvtMiscOptions_Impl::~SvtMiscOptions_Impl()
{
// We must save our current values .. if user forgets it!
- if( IsModified() == sal_True )
+ if( IsModified() )
{
Commit();
}
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 16b260b623c0..35df12b515dc 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -296,9 +296,9 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
}
}
- if( (pEntry->mxNode->hasChildrenOnDemand() == sal_True) != (pEntry->HasChildrenOnDemand() == sal_True) )
+ if( bool(pEntry->mxNode->hasChildrenOnDemand()) != pEntry->HasChildrenOnDemand() )
{
- pEntry->EnableChildrenOnDemand( pEntry->mxNode->hasChildrenOnDemand() ? sal_True : sal_False );
+ pEntry->EnableChildrenOnDemand( pEntry->mxNode->hasChildrenOnDemand() );
bChanged = true;
}