summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-24 11:45:27 +0200
committerNoel Grandin <noel@peralex.com>2014-03-25 14:32:55 +0200
commit2d3a1d2a462c556f58bcae4371376cc8e4b16af3 (patch)
tree59129af882eb76c934e990b55fec5d779fe1b5ca /svtools
parentbdd2df77234e1df3d9795f45239d2f442e90670c (diff)
svtools: sal_Bool->bool
Change-Id: I6c57a52b4fc3ecb993af4526fefcca352ad269b5
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/simptabl.cxx19
-rw-r--r--svtools/source/contnr/svlbitm.cxx37
-rw-r--r--svtools/source/control/scrwin.cxx28
-rw-r--r--svtools/source/edit/svmedit2.cxx4
-rw-r--r--svtools/source/misc/stringtransfer.cxx6
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx12
6 files changed, 53 insertions, 53 deletions
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index 71d802fd32dd..16e42cfd9d74 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -93,13 +93,13 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits):
m_rParentTableContainer(rParent),
aHeaderBar(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
nHeaderItemId(1),
- bPaintFlag(sal_True)
+ bPaintFlag(true)
{
m_rParentTableContainer.SetTable(this);
- bSortDirection=sal_True;
- nSortCol=0xFFFF;
- nOldPos=0;
+ bSortDirection = true;
+ nSortCol = 0xFFFF;
+ nOldPos = 0;
aHeaderBar.SetStartDragHdl(LINK( this, SvSimpleTable, StartDragHdl));
aHeaderBar.SetDragHdl(LINK( this, SvSimpleTable, DragHdl));
@@ -206,8 +206,9 @@ void SvSimpleTable::Paint( const Rectangle& rRect )
nPos= static_cast< sal_uInt16 >( GetTab(i) );
}
}
- bPaintFlag=sal_True;
+ bPaintFlag = true;
}
+
void SvSimpleTable::InsertHeaderEntry(const OUString& rText,
sal_uInt16 nCol, HeaderBarItemBits nBits)
{
@@ -244,7 +245,7 @@ void SvSimpleTable::HideTable()
m_rParentTableContainer.Hide();
}
-sal_Bool SvSimpleTable::IsVisible() const
+bool SvSimpleTable::IsVisible() const
{
return m_rParentTableContainer.IsVisible();
}
@@ -259,7 +260,7 @@ void SvSimpleTable::DisableTable()
m_rParentTableContainer.Disable();
}
-sal_Bool SvSimpleTable::IsEnabled() const
+bool SvSimpleTable::IsEnabled() const
{
return m_rParentTableContainer.IsEnabled();
}
@@ -269,7 +270,7 @@ sal_uInt16 SvSimpleTable::GetSelectedCol()
return (aHeaderBar.GetCurItemId()-1);
}
-void SvSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir)
+void SvSimpleTable::SortByCol(sal_uInt16 nCol, bool bDir)
{
bSortDirection=bDir;
if(nSortCol!=0xFFFF)
@@ -362,7 +363,7 @@ void SvSimpleTable::HBarEndDrag()
nPos = nNewSize;
}
}
- bPaintFlag=sal_False;
+ bPaintFlag = false;
Invalidate();
Update();
}
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index c0eb5a80cc8f..9fabd7cb5a10 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -29,19 +29,19 @@
struct SvLBoxButtonData_Impl
{
SvTreeListEntry* pEntry;
- sal_Bool bDefaultImages;
- sal_Bool bShowRadioButton;
+ bool bDefaultImages;
+ bool bShowRadioButton;
- SvLBoxButtonData_Impl() : pEntry( NULL ), bDefaultImages( sal_False ), bShowRadioButton( sal_False ) {}
+ SvLBoxButtonData_Impl() : pEntry( NULL ), bDefaultImages( false ), bShowRadioButton( false ) {}
};
-void SvLBoxButtonData::InitData( sal_Bool bImagesFromDefault, bool _bRadioBtn, const Control* pCtrl )
+void SvLBoxButtonData::InitData( bool bImagesFromDefault, bool _bRadioBtn, const Control* pCtrl )
{
pImpl = new SvLBoxButtonData_Impl;
- bDataOk = sal_False;
+ bDataOk = false;
eState = SV_BUTTON_UNCHECKED;
pImpl->bDefaultImages = bImagesFromDefault;
pImpl->bShowRadioButton = ( _bRadioBtn != false );
@@ -52,14 +52,12 @@ void SvLBoxButtonData::InitData( sal_Bool bImagesFromDefault, bool _bRadioBtn, c
SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings )
{
-
- InitData( sal_True, false, pControlForSettings );
+ InitData( true, false, pControlForSettings );
}
SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn )
{
-
- InitData( sal_True, _bRadioBtn, pControlForSettings );
+ InitData( true, _bRadioBtn, pControlForSettings );
}
SvLBoxButtonData::~SvLBoxButtonData()
@@ -105,7 +103,7 @@ void SvLBoxButtonData::SetWidthAndHeight()
Size aSize = aBmps[0].GetSizePixel();
nWidth = aSize.Width();
nHeight = aSize.Height();
- bDataOk = sal_True;
+ bDataOk = true;
}
@@ -165,12 +163,12 @@ void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl )
}
}
-sal_Bool SvLBoxButtonData::HasDefaultImages( void ) const
+bool SvLBoxButtonData::HasDefaultImages( void ) const
{
return pImpl->bDefaultImages;
}
-sal_Bool SvLBoxButtonData::IsRadio() {
+bool SvLBoxButtonData::IsRadio() {
return pImpl->bShowRadioButton;
}
@@ -331,7 +329,7 @@ sal_uInt16 SvLBoxButton::GetType() const
return SV_ITEM_ID_LBOXBUTTON;
}
-sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry )
+bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry )
{
if ( CheckModification() )
{
@@ -342,7 +340,7 @@ sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry )
pData->StoreButtonState( pEntry, nItemFlags );
pData->CallLink();
}
- return sal_False;
+ return false;
}
void SvLBoxButton::Paint(
@@ -355,7 +353,7 @@ void SvLBoxButton::Paint(
rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
//Native drawing
- sal_Bool bNativeOK = sal_False;
+ bool bNativeOK = false;
ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
if ( nIndex != SV_BMP_STATICIMAGE && rDev.IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) )
@@ -492,16 +490,15 @@ sal_uInt16 SvLBoxContextBmp::GetType() const
return SV_ITEM_ID_LBOXCONTEXTBMP;
}
-sal_Bool SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 )
+bool SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 )
{
-
- sal_Bool bSuccess = sal_True;
+ bool bSuccess = true;
m_pImpl->m_aImage1 = _rBitmap1;
m_pImpl->m_aImage2 = _rBitmap2;
return bSuccess;
}
-Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst )
+Image& SvLBoxContextBmp::implGetImageStore( bool _bFirst )
{
// OJ: #i27071# wrong mode so we just return the normal images
@@ -524,7 +521,7 @@ void SvLBoxContextBmp::Paint(
// get the image.
const Image& rImage = implGetImageStore(pView->IsExpanded() != m_pImpl->m_bExpanded);
- sal_Bool _bSemiTransparent = pEntry && ( 0 != ( SV_ENTRYFLAG_SEMITRANSPARENT & pEntry->GetFlags( ) ) );
+ bool _bSemiTransparent = pEntry && ( 0 != ( SV_ENTRYFLAG_SEMITRANSPARENT & pEntry->GetFlags( ) ) );
// draw
sal_uInt16 nStyle = _rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
if ( _bSemiTransparent )
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 0c697f8ceaef..68feada7de87 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -24,10 +24,10 @@
void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags )
{
- bHandleDragging = (sal_Bool) ( nFlags & SCRWIN_THUMBDRAGGING );
+ bHandleDragging = (bool) ( nFlags & SCRWIN_THUMBDRAGGING );
bVCenter = (nFlags & SCRWIN_VCENTER) == SCRWIN_VCENTER;
bHCenter = (nFlags & SCRWIN_HCENTER) == SCRWIN_HCENTER;
- bScrolling = sal_False;
+ bScrolling = false;
// set the handlers for the scrollbars
aVScroll.SetScrollHdl( LINK(this, ScrollableWindow, ScrollHdl) );
@@ -109,7 +109,7 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
{
// notify the start of scrolling, if not already scrolling
if ( !bScrolling )
- StartScroll(), bScrolling = sal_True;
+ StartScroll(), bScrolling = true;
// get the delta in logic coordinates
Size aDelta( PixelToLogic( Size( aHScroll.GetDelta(), aVScroll.GetDelta() ) ) );
@@ -124,7 +124,7 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
}
// notify the end of scrolling
- bScrolling = sal_False;
+ bScrolling = false;
EndScroll( aDelta.Width(), aDelta.Height() );
return 0;
}
@@ -135,7 +135,7 @@ IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll )
{
// notify the start of scrolling, if not already scrolling
if ( !bScrolling )
- StartScroll(), bScrolling = sal_True;
+ StartScroll(), bScrolling = true;
if ( bHandleDragging )
{
@@ -159,25 +159,27 @@ void ScrollableWindow::Resize()
// determine the size of the output-area and if we need scrollbars
const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize();
- sal_Bool bVVisible = sal_False; // by default no vertical-ScrollBar
- sal_Bool bHVisible = sal_False; // by default no horizontal-ScrollBar
- sal_Bool bChanged; // determines if a visiblility was changed
+ bool bVVisible = false; // by default no vertical-ScrollBar
+ bool bHVisible = false; // by default no horizontal-ScrollBar
+ bool bChanged; // determines if a visiblility was changed
do
{
- bChanged = sal_False;
+ bChanged = false;
// does we need a vertical ScrollBar
if ( aOutPixSz.Width() < aTotPixSz.Width() && !bHVisible )
- { bHVisible = sal_True;
+ {
+ bHVisible = true;
aOutPixSz.Height() -= nScrSize;
- bChanged = sal_True;
+ bChanged = true;
}
// does we need a horizontal ScrollBar
if ( aOutPixSz.Height() < aTotPixSz.Height() && !bVVisible )
- { bVVisible = sal_True;
+ {
+ bVVisible = true;
aOutPixSz.Width() -= nScrSize;
- bChanged = sal_True;
+ bChanged = true;
}
}
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 56d4c5e568ce..c2c2dff3d845 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -39,12 +39,12 @@ ExtMultiLineEdit::~ExtMultiLineEdit()
{
}
-void ExtMultiLineEdit::InsertText( const OUString& rNew, sal_Bool )
+void ExtMultiLineEdit::InsertText( const OUString& rNew, bool )
{
GetTextView()->InsertText( rNew, false );
}
-void ExtMultiLineEdit::SetAutoScroll( sal_Bool bAutoScroll )
+void ExtMultiLineEdit::SetAutoScroll( bool bAutoScroll )
{
GetTextView()->SetAutoScroll( bAutoScroll );
}
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index df46b676cdef..d37b225b2104 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -65,7 +65,7 @@ namespace svt
}
- sal_Bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow )
+ bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow )
{
TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow );
@@ -79,13 +79,13 @@ namespace svt
if (SOT_FORMAT_STRING == aSearch->mnSotId)
{
OUString sContent;
- sal_Bool bSuccess = aClipboardData.GetString( SOT_FORMAT_STRING, sContent );
+ bool bSuccess = aClipboardData.GetString( SOT_FORMAT_STRING, sContent );
_rContent = sContent;
return bSuccess;
}
}
- return sal_False;
+ return false;
}
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index a2d3b0ee0560..1c511e449343 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -51,8 +51,8 @@ StatusbarController::StatusbarController(
const OUString& aCommandURL,
unsigned short nID ) :
OWeakObject()
- , m_bInitialized( sal_False )
- , m_bDisposed( sal_False )
+ , m_bInitialized( false )
+ , m_bDisposed( false )
, m_nID( nID )
, m_xFrame( xFrame )
, m_xContext( rxContext )
@@ -63,8 +63,8 @@ StatusbarController::StatusbarController(
StatusbarController::StatusbarController() :
OWeakObject()
- , m_bInitialized( sal_False )
- , m_bDisposed( sal_False )
+ , m_bInitialized( false )
+ , m_bDisposed( false )
, m_nID( 0 )
, m_aListenerContainer( m_aMutex )
{
@@ -137,7 +137,7 @@ throw ( Exception, RuntimeException, std::exception )
if ( !bInitialized )
{
SolarMutexGuard aSolarMutexGuard;
- m_bInitialized = sal_True;
+ m_bInitialized = true;
PropertyValue aPropValue;
for ( int i = 0; i < aArguments.getLength(); i++ )
@@ -230,7 +230,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
m_xParentWindow.clear();
m_xStatusbarItem.clear();
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
void SAL_CALL StatusbarController::addEventListener( const Reference< XEventListener >& xListener )