summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:59:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:19 +0100
commitc1d37365c42a0627a66310c46d4beb2337633654 (patch)
tree5eccb263b481a3112c8d400054120cbd5db2963f
parent946f6132f9172fc7f79a1d99051011426767bf90 (diff)
bool improvements
Change-Id: Iede12ed1e35581cf48d64b898f22949d0c1aa6de
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/generic/fontmanager/parseAFM.cxx4
-rw-r--r--vcl/generic/print/genpspgraphics.cxx10
-rw-r--r--vcl/headless/svptext.cxx4
-rw-r--r--vcl/source/app/dbggui.cxx2
-rw-r--r--vcl/source/app/help.cxx2
-rw-r--r--vcl/source/app/svapp.cxx2
-rw-r--r--vcl/source/control/button.cxx4
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/control/ctrl.cxx6
-rw-r--r--vcl/source/control/ilstbox.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx4
-rw-r--r--vcl/source/control/tabctrl.cxx12
-rw-r--r--vcl/source/edit/textdata.cxx4
-rw-r--r--vcl/source/edit/vclmedit.cxx4
-rw-r--r--vcl/source/filter/graphicfilter.cxx2
-rw-r--r--vcl/source/filter/igif/gifread.cxx4
-rw-r--r--vcl/source/filter/sgvmain.cxx4
-rw-r--r--vcl/source/filter/wmf/enhwmf.cxx8
-rw-r--r--vcl/source/filter/wmf/winmtf.cxx2
-rw-r--r--vcl/source/gdi/bitmap3.cxx2
-rw-r--r--vcl/source/gdi/gfxlink.cxx2
-rw-r--r--vcl/source/gdi/metaact.cxx32
-rw-r--r--vcl/source/gdi/outdev.cxx132
-rw-r--r--vcl/source/gdi/outdev3.cxx48
-rw-r--r--vcl/source/gdi/outdev4.cxx8
-rw-r--r--vcl/source/gdi/outmap.cxx10
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx70
-rw-r--r--vcl/source/gdi/print.cxx18
-rw-r--r--vcl/source/gdi/print2.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx14
-rw-r--r--vcl/source/gdi/svgdata.cxx2
-rw-r--r--vcl/source/gdi/virdev.cxx8
-rw-r--r--vcl/source/gdi/wall.cxx4
-rw-r--r--vcl/source/window/brdwin.cxx18
-rw-r--r--vcl/source/window/btndlg.cxx4
-rw-r--r--vcl/source/window/builder.cxx26
-rw-r--r--vcl/source/window/dialog.cxx12
-rw-r--r--vcl/source/window/dlgctrl.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx24
-rw-r--r--vcl/source/window/dockwin.cxx14
-rw-r--r--vcl/source/window/floatwin.cxx14
-rw-r--r--vcl/source/window/menu.cxx6
-rw-r--r--vcl/source/window/printdlg.cxx18
-rw-r--r--vcl/source/window/scrwnd.cxx4
-rw-r--r--vcl/source/window/split.cxx2
-rw-r--r--vcl/source/window/syswin.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx152
-rw-r--r--vcl/source/window/toolbox2.cxx36
-rw-r--r--vcl/source/window/window.cxx308
-rw-r--r--vcl/source/window/window2.cxx38
-rw-r--r--vcl/source/window/winproc.cxx36
-rw-r--r--vcl/source/window/wrkwin.cxx4
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx6
-rw-r--r--vcl/unx/generic/app/saldisp.cxx4
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx10
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx10
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx4
-rw-r--r--vcl/unx/generic/window/salframe.cxx6
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx8
63 files changed, 606 insertions, 606 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index d6bc5565b8cc..4ff925aff0bc 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -343,7 +343,7 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar
std::vector< lang_and_element > lang_and_elements;
lang_and_elements.push_back(lang_and_element(elementlang, *element));
int k = 1;
- while (1)
+ while (true)
{
if (FcPatternGetString( pPattern, elementlangtype, k, &elementlang ) != FcResultMatch)
break;
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 7f20679d1691..cc3a32e7a18b 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -264,7 +264,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
rChar.width = m_aGlobalMetricY.width;
rChar.height = pMetrics[ i ].adv;
if( table_vert[i] != table[i] )
- m_pMetrics->m_bVerticalSubstitutions[ nPage*256 + i ] = 1;
+ m_pMetrics->m_bVerticalSubstitutions[ nPage*256 + i ] = true;
}
}
free( pMetrics );
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index 2bff647b27a6..cac5b13c5e54 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -445,9 +445,9 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
if ((keyword = token(fp,tokenlen)) != NULL)
{
if (MATCH(keyword, False))
- gfi->isFixedPitch = 0;
+ gfi->isFixedPitch = false;
else
- gfi->isFixedPitch = 1;
+ gfi->isFixedPitch = true;
}
break;
case UNDERLINEPOSITION:
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 938c9083c4c0..ad4d43f97801 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -391,12 +391,12 @@ void GenPspGraphics::SetFillColor( SalColor nSalColor )
void GenPspGraphics::SetROPLineColor( SalROPColor )
{
- DBG_ASSERT( 0, "Error: PrinterGfx::SetROPLineColor() not implemented" );
+ DBG_ASSERT( false, "Error: PrinterGfx::SetROPLineColor() not implemented" );
}
void GenPspGraphics::SetROPFillColor( SalROPColor )
{
- DBG_ASSERT( 0, "Error: PrinterGfx::SetROPFillColor() not implemented" );
+ DBG_ASSERT( false, "Error: PrinterGfx::SetROPFillColor() not implemented" );
}
void GenPspGraphics::SetXORMode( bool bSet, bool )
@@ -489,7 +489,7 @@ void GenPspGraphics::invert( sal_uInt32,
const SalPoint*,
SalInvert )
{
- DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
+ DBG_ASSERT( false, "Error: PrinterGfx::Invert() not implemented" );
}
sal_Bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
@@ -515,12 +515,12 @@ void GenPspGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSa
Rectangle aDst (Point(rPosAry.mnDestX, rPosAry.mnDestY),
Size(rPosAry.mnDestWidth, rPosAry.mnDestHeight));
- BitmapBuffer* pBuffer= const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(sal_True);
+ BitmapBuffer* pBuffer= const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(true);
SalPrinterBmp aBmp (pBuffer);
m_pPrinterGfx->DrawBitmap (aDst, aSrc, aBmp);
- const_cast<SalBitmap&>(rSalBitmap).ReleaseBuffer (pBuffer, sal_True);
+ const_cast<SalBitmap&>(rSalBitmap).ReleaseBuffer (pBuffer, true);
}
void GenPspGraphics::drawBitmap( const SalTwoRect&,
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index a634922e71cc..29c823d50283 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -410,9 +410,9 @@ bool SvpSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, B2DPolyPolygon& rPol
aGlyphId &= GF_IDXMASK;
if( pSF->GetGlyphOutline( aGlyphId, rPolyPoly ) )
- return sal_True;
+ return true;
- return sal_False;
+ return false;
}
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 941a6c7e624d..3ae073b28fa4 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1124,7 +1124,7 @@ void DbgInfoDialog::SetInfoText( const OUString& rStr )
void DbgDialogTest( Window* pWindow )
{
- bool aAccelBuf[65536] = {0};
+ bool aAccelBuf[65536] = {false};
sal_uInt16 nChildCount = pWindow->GetChildCount();
Window* pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
Window* pChild;
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 5b2bd3d16d68..9ea5ed544cea 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -400,7 +400,7 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText )
void HelpTextWindow::ImplShow()
{
ImplDelData aDogTag( this );
- Show( sal_True, SHOW_NOACTIVATE );
+ Show( true, SHOW_NOACTIVATE );
if( !aDogTag.IsDead() )
Update();
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index ac13c7360f4d..67374f3387aa 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1310,7 +1310,7 @@ Window* Application::GetDefDialogParent()
// #103442# find some useful dialog parent if there
// was no default set
// NOTE: currently even the default is not used
- if( sal_False && pSVData->maWinData.mpDefDialogParent != NULL )
+ if( false && pSVData->maWinData.mpDefDialogParent != NULL )
return pSVData->maWinData.mpDefDialogParent;
else
{
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 9634a310bc7b..57d817e78dce 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -622,7 +622,7 @@ bool Button::set_property(const OString &rKey, const OString &rValue)
void PushButton::ImplInitPushButtonData()
{
- mpWindowImpl->mbPushButton = sal_True;
+ mpWindowImpl->mbPushButton = true;
meSymbol = SYMBOL_NOSYMBOL;
meState = STATE_NOCHECK;
@@ -3235,7 +3235,7 @@ void CheckBox::ImplInvalidateOrDrawCheckBoxState()
void CheckBox::ImplDrawCheckBoxState()
{
- bool bNativeOK = sal_True;
+ bool bNativeOK = true;
if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) )
{
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index aa34972a2b55..95708f367127 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -211,7 +211,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle )
if ( mpFloatWin )
mpFloatWin->SetImplListBox( mpImplLB );
else
- mpImplLB->GetMainWindow()->AllowGrabFocus( sal_True );
+ mpImplLB->GetMainWindow()->AllowGrabFocus( true );
ImplCalcEditHeight();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index e312c18bb402..47ff23ead0e5 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -38,7 +38,7 @@ using namespace vcl;
void Control::ImplInitControlData()
{
- mbHasControlFocus = sal_False;
+ mbHasControlFocus = false;
mpControlData = new ImplControlData;
}
@@ -286,7 +286,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
{
if ( !mbHasControlFocus )
{
- mbHasControlFocus = sal_True;
+ mbHasControlFocus = true;
StateChanged( STATE_CHANGE_CONTROL_FOCUS );
if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) )
// been destroyed within the handler
@@ -300,7 +300,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
Window* pFocusWin = Application::GetFocusWindow();
if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
{
- mbHasControlFocus = sal_False;
+ mbHasControlFocus = false;
StateChanged( STATE_CHANGE_CONTROL_FOCUS );
if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
// been destroyed within the handler
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 445ec1e1d63d..c72a2940e317 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3274,7 +3274,7 @@ void ImplListBoxFloatingWindow::StartFloat( sal_Bool bStartTracking )
mpImplLB->ShowProminentEntry( nPos );
if( bStartTracking )
- mpImplLB->GetMainWindow()->EnableMouseMoveSelect( sal_True );
+ mpImplLB->GetMainWindow()->EnableMouseMoveSelect( true );
if ( mpImplLB->GetMainWindow()->IsGrabFocusAllowed() )
mpImplLB->GetMainWindow()->GrabFocus();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 551382d8493d..ea5bd1e4148e 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -177,7 +177,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
mpImplLB->SetSelectionChangedHdl( LINK( this, ListBox, ImplSelectionChangedHdl ) );
}
else
- mpImplLB->GetMainWindow()->AllowGrabFocus( sal_True );
+ mpImplLB->GetMainWindow()->AllowGrabFocus( true );
SetCompoundControl( sal_True );
}
@@ -905,7 +905,7 @@ void ListBox::StateChanged( StateChangedType nType )
bool ListBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = 0;
+ bool nDone = false;
if ( mpImplLB )
{
if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpImplWin ) )
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 2c9a2da557e0..9e4646204d76 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -58,7 +58,7 @@ struct ImplTabItem
ImplTabItem()
: mnId( 0 ), mpTabPage( NULL ),
- mnLine( 0 ), mbFullVisible( sal_False ), mbEnabled( true )
+ mnLine( 0 ), mbFullVisible( false ), mbEnabled( true )
{}
};
@@ -406,7 +406,7 @@ namespace MinimumRaggednessWrap
// optimal solution
size_t j = nWidthsCount - 1;
- while (1)
+ while (true)
{
aSolution.push_front(j);
if (!aWrapPoints[j])
@@ -526,7 +526,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe
mbSmallInvalidate = sal_False;
it->maRect = aNewRect;
it->mnLine = nLines;
- it->mbFullVisible = sal_True;
+ it->mbFullVisible = true;
nLineWidthAry[nLines] += aSize.Width();
nX += aSize.Width();
@@ -1287,7 +1287,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
if( !rRect.IsEmpty() )
aClipRgn.Intersect( rRect );
if( bLayout || !aClipRgn.IsEmpty() )
- ImplDrawItem( pItem, aCurRect, bLayout, (pItem==pFirstTab), (pItem==pLastTab), sal_False );
+ ImplDrawItem( pItem, aCurRect, bLayout, (pItem==pFirstTab), (pItem==pLastTab), false );
}
if ( bDrawTabsRTL )
@@ -1303,7 +1303,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
if( !rRect.IsEmpty() )
aClipRgn.Intersect( rRect );
if( bLayout || !aClipRgn.IsEmpty() )
- ImplDrawItem( pCurItem, aCurRect, bLayout, (pCurItem==pFirstTab), (pCurItem==pLastTab), sal_True );
+ ImplDrawItem( pCurItem, aCurRect, bLayout, (pCurItem==pFirstTab), (pCurItem==pLastTab), true );
}
}
@@ -1796,7 +1796,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText,
pItem->mnId = nPageId;
pItem->mpTabPage = NULL;
pItem->maText = rText;
- pItem->mbFullVisible = sal_False;
+ pItem->mbFullVisible = false;
mbFormat = sal_True;
if ( IsUpdateMode() )
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index fc7138845848..6ac9459a26f4 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -290,9 +290,9 @@ TEIMEInfos::TEIMEInfos( const TextPaM& rPos, const OUString& rOldTextAfterStartP
{
aPos = rPos;
nLen = 0;
- bCursor = sal_True;
+ bCursor = true;
pAttribs = NULL;
- bWasCursorOverwrite = sal_False;
+ bWasCursorOverwrite = false;
}
TEIMEInfos::~TEIMEInfos()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 9e6cc0457dea..c468468013a1 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -241,9 +241,9 @@ void ImpVclMEdit::InitFromStyle( WinBits nWinStyle )
SetAlign( nWinStyle );
if ( nWinStyle & WB_NOHIDESELECTION )
- mpTextWindow->SetAutoFocusHide( sal_False );
+ mpTextWindow->SetAutoFocusHide( false );
else
- mpTextWindow->SetAutoFocusHide( sal_True );
+ mpTextWindow->SetAutoFocusHide( true );
if ( nWinStyle & WB_READONLY )
mpTextWindow->GetTextView()->SetReadOnly( sal_True );
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 6305f3314854..6f647a136201 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -266,7 +266,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
{
SvLockBytes* pLockBytes = rStream.GetLockBytes();
if ( pLockBytes )
- pLockBytes->SetSynchronMode( sal_True );
+ pLockBytes->SetSynchronMode( true );
rStream.Seek( STREAM_SEEK_TO_END );
nStreamLen = rStream.Tell() - nStreamPos;
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 8acbd635e0ac..553b45c33e5c 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -144,7 +144,7 @@ bool GIFReader::ReadGlobalHeader()
{
SvMemoryStream aMemStm;
- aMemStm.SetBuffer( pBuf, 7, sal_False, 7 );
+ aMemStm.SetBuffer( pBuf, 7, false, 7 );
aMemStm >> nGlobalWidth;
aMemStm >> nGlobalHeight;
aMemStm >> nRF;
@@ -347,7 +347,7 @@ bool GIFReader::ReadLocalHeader()
BitmapPalette* pPal;
sal_uInt8 nFlags;
- aMemStm.SetBuffer( (char*) pBuf, 9, sal_False, 9 );
+ aMemStm.SetBuffer( (char*) pBuf, 9, false, 9 );
aMemStm >> nImagePosX;
aMemStm >> nImagePosY;
aMemStm >> nImageWidth;
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index cf02e1581cc0..f6eb1ee98bc9 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -544,10 +544,10 @@ void SplnType::Draw(OutputDevice& rOut)
sal_uInt16 i;
for(i=0;i<nPoints;i++) aSpln.SetPoint(Point(EckP[i].x,EckP[i].y),i);
if ((Flags & PolyClosBit) !=0) {
- Spline2Poly(aSpln,sal_True,aPoly);
+ Spline2Poly(aSpln,true,aPoly);
if (aPoly.GetSize()>0) rOut.DrawPolygon(aPoly);
} else {
- Spline2Poly(aSpln,sal_False,aPoly);
+ Spline2Poly(aSpln,false,aPoly);
if (aPoly.GetSize()>0) rOut.DrawPolyLine(aPoly);
}
}
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 6ee654427267..0dc1227207c7 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1025,7 +1025,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
{
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
- aTmp.ObjectOwnsMemory( sal_True );
+ aTmp.ObjectOwnsMemory( true );
aTmp.WriteUChar( (sal_uInt8)'B' )
.WriteUChar( (sal_uInt8)'M' )
.WriteUInt32( (sal_uInt32)cbBitsSrc )
@@ -1088,7 +1088,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
{
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
- aTmp.ObjectOwnsMemory( sal_True );
+ aTmp.ObjectOwnsMemory( true );
aTmp.WriteUChar( (sal_uInt8)'B' )
.WriteUChar( (sal_uInt8)'M' )
.WriteUInt32( (sal_uInt32)cbBitsSrc )
@@ -1158,7 +1158,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
{
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
- aTmp.ObjectOwnsMemory( sal_True );
+ aTmp.ObjectOwnsMemory( true );
aTmp.WriteUChar( (sal_uInt8)'B' )
.WriteUChar( (sal_uInt8)'M' )
.WriteUInt32( (sal_uInt32)cbBitsSrc )
@@ -1395,7 +1395,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
- aTmp.ObjectOwnsMemory( sal_True );
+ aTmp.ObjectOwnsMemory( true );
aTmp.WriteUChar( (sal_uInt8)'B' )
.WriteUChar( (sal_uInt8)'M' )
.WriteUInt32( (sal_uInt32)cbBits )
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index df47935d6cf9..988bd0f95e90 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -271,7 +271,7 @@ WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigI
{
SvLockBytes *pLB = pWMF->GetLockBytes();
if ( pLB )
- pLB->SetSynchronMode( sal_True );
+ pLB->SetSynchronMode( true );
nStartPos = pWMF->Tell();
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 8522af01c529..a4accba5de0f 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -958,7 +958,7 @@ sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
nScaleFlag );
}
else
- bRet = sal_True;
+ bRet = true;
return bRet;
}
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index d04b146cff63..de5daf3444d2 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -198,7 +198,7 @@ sal_Bool GfxLink::LoadNative( Graphic& rGraphic )
SvMemoryStream aMemStm;
sal_uLong nCvtType;
- aMemStm.SetBuffer( (char*) pData, mnBufSize, sal_False, mnBufSize );
+ aMemStm.SetBuffer( (char*) pData, mnBufSize, false, mnBufSize );
switch( meType )
{
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 3151ac28dbed..307e81088fd0 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -290,7 +290,7 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
WritePair( rOStm, maPt );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
}
// ------------------------------------------------------------------------
@@ -299,7 +299,7 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
rIStm >> maPt;
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
}
// ========================================================================
@@ -2429,7 +2429,7 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
WriteDIB(maBmp, rOStm, false, true);
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
WritePair( rOStm, maDstPt );
WritePair( rOStm, maDstSz );
WritePair( rOStm, maSrcPt );
@@ -2443,7 +2443,7 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
ReadDIB(maBmp, rIStm, true);
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz;
}
@@ -3056,7 +3056,7 @@ sal_Bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const
void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
rOStm.WriteUChar( mbSet );
}
@@ -3065,7 +3065,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
rIStm >> mbSet;
}
@@ -3114,7 +3114,7 @@ sal_Bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const
void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
rOStm.WriteUChar( mbSet );
}
@@ -3123,7 +3123,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
rIStm >> mbSet;
}
@@ -3167,7 +3167,7 @@ sal_Bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const
void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
}
// ------------------------------------------------------------------------
@@ -3175,7 +3175,7 @@ void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
}
// ========================================================================
@@ -3223,7 +3223,7 @@ sal_Bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const
void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
rOStm.WriteUChar( mbSet );
}
@@ -3232,7 +3232,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
rIStm >> mbSet;
}
@@ -3281,7 +3281,7 @@ sal_Bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const
void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
rOStm.WriteUChar( mbSet );
}
@@ -3290,7 +3290,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
rIStm >> mbSet;
}
@@ -3339,7 +3339,7 @@ sal_Bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const
void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- maColor.Write( rOStm, sal_True );
+ maColor.Write( rOStm, true );
rOStm.WriteUChar( mbSet );
}
@@ -3348,7 +3348,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- maColor.Read( rIStm, sal_True );
+ maColor.Read( rIStm, true );
rIStm >> mbSet;
}
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 8009275f24da..1e8d76638344 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -359,33 +359,33 @@ OutputDevice::OutputDevice() :
mnTextLayoutMode = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT;
meOutDevType = OUTDEV_DONTKNOW;
meOutDevViewType = OUTDEV_VIEWTYPE_DONTKNOW;
- mbMap = sal_False;
- mbMapIsDefault = sal_True;
- mbClipRegion = sal_False;
- mbBackground = sal_False;
- mbOutput = sal_True;
- mbDevOutput = sal_False;
- mbOutputClipped = sal_False;
+ mbMap = false;
+ mbMapIsDefault = true;
+ mbClipRegion = false;
+ mbBackground = false;
+ mbOutput = true;
+ mbDevOutput = false;
+ mbOutputClipped = false;
maTextColor = Color( COL_BLACK );
maOverlineColor = Color( COL_TRANSPARENT );
meTextAlign = maFont.GetAlign();
meRasterOp = ROP_OVERPAINT;
mnAntialiasing = 0;
meTextLanguage = 0; // TODO: get default from configuration?
- mbLineColor = sal_True;
- mbFillColor = sal_True;
- mbInitLineColor = sal_True;
- mbInitFillColor = sal_True;
- mbInitFont = sal_True;
- mbInitTextColor = sal_True;
- mbInitClipRegion = sal_True;
- mbClipRegionSet = sal_False;
- mbKerning = sal_False;
- mbNewFont = sal_True;
- mbTextLines = sal_False;
- mbTextSpecial = sal_False;
- mbRefPoint = sal_False;
- mbEnableRTL = sal_False; // mirroring must be explicitly allowed (typically for windows only)
+ mbLineColor = true;
+ mbFillColor = true;
+ mbInitLineColor = true;
+ mbInitFillColor = true;
+ mbInitFont = true;
+ mbInitTextColor = true;
+ mbInitClipRegion = true;
+ mbClipRegionSet = false;
+ mbKerning = false;
+ mbNewFont = true;
+ mbTextLines = false;
+ mbTextSpecial = false;
+ mbRefPoint = false;
+ mbEnableRTL = false; // mirroring must be explicitly allowed (typically for windows only)
// struct ImplMapRes
maMapRes.mnMapOfsX = 0;
@@ -562,11 +562,11 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
if ( mpGraphics )
return mpGraphics;
- mbInitLineColor = sal_True;
- mbInitFillColor = sal_True;
- mbInitFont = sal_True;
- mbInitTextColor = sal_True;
- mbInitClipRegion = sal_True;
+ mbInitLineColor = true;
+ mbInitFillColor = true;
+ mbInitFont = true;
+ mbInitTextColor = true;
+ mbInitClipRegion = true;
ImplSVData* pSVData = ImplGetSVData();
if ( meOutDevType == OUTDEV_WINDOW )
@@ -892,7 +892,7 @@ void OutputDevice::ImplInitLineColor()
else
mpGraphics->SetLineColor();
- mbInitLineColor = sal_False;
+ mbInitLineColor = false;
}
void OutputDevice::ImplInitFillColor()
@@ -913,7 +913,7 @@ void OutputDevice::ImplInitFillColor()
else
mpGraphics->SetFillColor();
- mbInitFillColor = sal_False;
+ mbInitFillColor = false;
}
void OutputDevice::ImplInitClipRegion()
@@ -941,23 +941,23 @@ void OutputDevice::ImplInitClipRegion()
if ( mbClipRegion )
aRegion.Intersect( ImplPixelToDevicePixel( maRegion ) );
if ( aRegion.IsEmpty() )
- mbOutputClipped = sal_True;
+ mbOutputClipped = true;
else
{
- mbOutputClipped = sal_False;
+ mbOutputClipped = false;
ImplSelectClipRegion( aRegion );
}
- mbClipRegionSet = sal_True;
+ mbClipRegionSet = true;
}
else
{
if ( mbClipRegion )
{
if ( maRegion.IsEmpty() )
- mbOutputClipped = sal_True;
+ mbOutputClipped = true;
else
{
- mbOutputClipped = sal_False;
+ mbOutputClipped = false;
// #102532# Respect output offset also for clip region
Region aRegion( ImplPixelToDevicePixel( maRegion ) );
@@ -976,30 +976,30 @@ void OutputDevice::ImplInitClipRegion()
if ( aRegion.IsEmpty() )
{
- mbOutputClipped = sal_True;
+ mbOutputClipped = true;
}
else
{
- mbOutputClipped = sal_False;
+ mbOutputClipped = false;
ImplSelectClipRegion( aRegion );
}
}
- mbClipRegionSet = sal_True;
+ mbClipRegionSet = true;
}
else
{
if ( mbClipRegionSet )
{
mpGraphics->ResetClipRegion();
- mbClipRegionSet = sal_False;
+ mbClipRegionSet = false;
}
- mbOutputClipped = sal_False;
+ mbOutputClipped = false;
}
}
- mbInitClipRegion = sal_False;
+ mbInitClipRegion = false;
}
void OutputDevice::ImplSetClipRegion( const Region* pRegion )
@@ -1011,15 +1011,15 @@ void OutputDevice::ImplSetClipRegion( const Region* pRegion )
if ( mbClipRegion )
{
maRegion = Region(true);
- mbClipRegion = sal_False;
- mbInitClipRegion = sal_True;
+ mbClipRegion = false;
+ mbInitClipRegion = true;
}
}
else
{
maRegion = *pRegion;
- mbClipRegion = sal_True;
- mbInitClipRegion = sal_True;
+ mbClipRegion = true;
+ mbInitClipRegion = true;
}
}
@@ -1091,7 +1091,7 @@ void OutputDevice::MoveClipRegion( long nHorzMove, long nVertMove )
maRegion.Move( ImplLogicWidthToDevicePixel( nHorzMove ),
ImplLogicHeightToDevicePixel( nVertMove ) );
- mbInitClipRegion = sal_True;
+ mbInitClipRegion = true;
}
if( mpAlphaVDev )
@@ -1106,8 +1106,8 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect )
Rectangle aRect = LogicToPixel( rRect );
maRegion.Intersect( aRect );
- mbClipRegion = sal_True;
- mbInitClipRegion = sal_True;
+ mbClipRegion = true;
+ mbInitClipRegion = true;
if( mpAlphaVDev )
mpAlphaVDev->IntersectClipRegion( rRect );
@@ -1123,8 +1123,8 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion )
Region aRegion = LogicToPixel( rRegion );
maRegion.Intersect( aRegion );
- mbClipRegion = sal_True;
- mbInitClipRegion = sal_True;
+ mbClipRegion = true;
+ mbInitClipRegion = true;
}
if( mpAlphaVDev )
@@ -1149,7 +1149,7 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
if ( meRasterOp != eRasterOp )
{
meRasterOp = eRasterOp;
- mbInitLineColor = mbInitFillColor = sal_True;
+ mbInitLineColor = mbInitFillColor = true;
if( mpGraphics || ImplGetGraphics() )
mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
@@ -1167,8 +1167,8 @@ void OutputDevice::SetLineColor()
if ( mbLineColor )
{
- mbInitLineColor = sal_True;
- mbLineColor = sal_False;
+ mbInitLineColor = true;
+ mbLineColor = false;
maLineColor = Color( COL_TRANSPARENT );
}
@@ -1229,8 +1229,8 @@ void OutputDevice::SetLineColor( const Color& rColor )
{
if ( mbLineColor )
{
- mbInitLineColor = sal_True;
- mbLineColor = sal_False;
+ mbInitLineColor = true;
+ mbLineColor = false;
maLineColor = Color( COL_TRANSPARENT );
}
}
@@ -1238,8 +1238,8 @@ void OutputDevice::SetLineColor( const Color& rColor )
{
if( maLineColor != aColor )
{
- mbInitLineColor = sal_True;
- mbLineColor = sal_True;
+ mbInitLineColor = true;
+ mbLineColor = true;
maLineColor = aColor;
}
}
@@ -1256,8 +1256,8 @@ void OutputDevice::SetFillColor()
if ( mbFillColor )
{
- mbInitFillColor = sal_True;
- mbFillColor = sal_False;
+ mbInitFillColor = true;
+ mbFillColor = false;
maFillColor = Color( COL_TRANSPARENT );
}
@@ -1314,8 +1314,8 @@ void OutputDevice::SetFillColor( const Color& rColor )
{
if ( mbFillColor )
{
- mbInitFillColor = sal_True;
- mbFillColor = sal_False;
+ mbInitFillColor = true;
+ mbFillColor = false;
maFillColor = Color( COL_TRANSPARENT );
}
}
@@ -1323,8 +1323,8 @@ void OutputDevice::SetFillColor( const Color& rColor )
{
if ( maFillColor != aColor )
{
- mbInitFillColor = sal_True;
- mbFillColor = sal_True;
+ mbInitFillColor = true;
+ mbFillColor = true;
maFillColor = aColor;
}
}
@@ -1337,7 +1337,7 @@ void OutputDevice::SetBackground()
{
maBackground = Wallpaper();
- mbBackground = sal_False;
+ mbBackground = false;
if( mpAlphaVDev )
mpAlphaVDev->SetBackground();
@@ -1349,9 +1349,9 @@ void OutputDevice::SetBackground( const Wallpaper& rBackground )
maBackground = rBackground;
if( rBackground.GetStyle() == WALLPAPER_NULL )
- mbBackground = sal_False;
+ mbBackground = false;
else
- mbBackground = sal_True;
+ mbBackground = true;
if( mpAlphaVDev )
mpAlphaVDev->SetBackground( rBackground );
@@ -1363,7 +1363,7 @@ void OutputDevice::SetRefPoint()
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRefPointAction( Point(), sal_False ) );
- mbRefPoint = sal_False;
+ mbRefPoint = false;
maRefPoint.X() = maRefPoint.Y() = 0L;
if( mpAlphaVDev )
@@ -1376,7 +1376,7 @@ void OutputDevice::SetRefPoint( const Point& rRefPoint )
if ( mpMetaFile )
mpMetaFile->AddAction( new MetaRefPointAction( rRefPoint, sal_True ) );
- mbRefPoint = sal_True;
+ mbRefPoint = true;
maRefPoint = rRefPoint;
if( mpAlphaVDev )
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 5ec49501f5d0..a994dd86e687 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2857,7 +2857,7 @@ void OutputDevice::ImplInitTextColor()
if ( mbInitTextColor )
{
mpGraphics->SetTextColor( ImplColorToSal( GetTextColor() ) );
- mbInitTextColor = sal_False;
+ mbInitTextColor = false;
}
}
@@ -2913,9 +2913,9 @@ bool OutputDevice::ImplNewFont() const
return false;
// mark when lower layers need to get involved
- mbNewFont = sal_False;
+ mbNewFont = false;
if( pFontEntry != pOldEntry )
- mbInitFont = sal_True;
+ mbInitFont = true;
// select font when it has not been initialized yet
if ( !pFontEntry->mbInit )
@@ -3013,10 +3013,10 @@ bool OutputDevice::ImplNewFont() const
{
Size aOrigSize = maFont.GetSize();
const_cast<Font&>(maFont).SetSize( Size( nNewWidth, aSize.Height() ) );
- mbMap = sal_False;
- mbNewFont = sal_True;
+ mbMap = false;
+ mbNewFont = true;
ImplNewFont(); // recurse once using stretched width
- mbMap = sal_True;
+ mbMap = true;
const_cast<Font&>(maFont).SetSize( aOrigSize );
}
}
@@ -3092,10 +3092,10 @@ void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout )
if ( mbLineColor || mbInitLineColor )
{
mpGraphics->SetLineColor();
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
}
mpGraphics->SetFillColor( ImplColorToSal( GetTextFillColor() ) );
- mbInitFillColor = sal_True;
+ mbInitFillColor = true;
ImplDrawTextRect( nX, nY, 0, -(mpFontEntry->maMetric.mnAscent + mnEmphasisAscent),
nWidth,
@@ -3410,7 +3410,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
if ( (nLineWidth == 1) && (nHeight == 1) )
{
mpGraphics->SetLineColor( ImplColorToSal( rColor ) );
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
long nEndX = nStartX+nWidth;
long nEndY = nStartY;
@@ -3440,10 +3440,10 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
if ( mbLineColor || mbInitLineColor )
{
mpGraphics->SetLineColor();
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
}
mpGraphics->SetFillColor( ImplColorToSal( rColor ) );
- mbInitFillColor = sal_True;
+ mbInitFillColor = true;
bDrawPixAsRect = true;
nPixWidth = nLineWidth;
nPixHeight = ((nLineWidth*mnDPIX)+(mnDPIY/2))/mnDPIY;
@@ -3451,7 +3451,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
else
{
mpGraphics->SetLineColor( ImplColorToSal( rColor ) );
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
nPixWidth = 1;
nPixHeight = 1;
bDrawPixAsRect = false;
@@ -3653,10 +3653,10 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
if ( mbLineColor || mbInitLineColor )
{
mpGraphics->SetLineColor();
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
}
mpGraphics->SetFillColor( ImplColorToSal( aColor ) );
- mbInitFillColor = sal_True;
+ mbInitFillColor = true;
long nLeft = nDistX;
@@ -3844,10 +3844,10 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
if ( mbLineColor || mbInitLineColor )
{
mpGraphics->SetLineColor();
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
}
mpGraphics->SetFillColor( ImplColorToSal( aColor ) );
- mbInitFillColor = sal_True;
+ mbInitFillColor = true;
const long& nLeft = nDistX;
@@ -4843,7 +4843,7 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
if ( mnAntialiasing != nMode )
{
mnAntialiasing = nMode;
- mbInitFont = sal_True;
+ mbInitFont = true;
if(mpGraphics)
{
@@ -4938,12 +4938,12 @@ void OutputDevice::SetFont( const Font& rNewFont )
&& (aFont.GetColor() != maFont.GetColor() || aFont.GetColor() != maTextColor ) )
{
maTextColor = aFont.GetColor();
- mbInitTextColor = sal_True;
+ mbInitTextColor = true;
if( mpMetaFile )
mpMetaFile->AddAction( new MetaTextColorAction( aFont.GetColor() ) );
}
maFont = aFont;
- mbNewFont = sal_True;
+ mbNewFont = true;
if( mpAlphaVDev )
{
@@ -5019,7 +5019,7 @@ void OutputDevice::SetTextColor( const Color& rColor )
if ( maTextColor != aColor )
{
maTextColor = aColor;
- mbInitTextColor = sal_True;
+ mbInitTextColor = true;
}
if( mpAlphaVDev )
@@ -5210,7 +5210,7 @@ void OutputDevice::SetTextAlign( TextAlign eAlign )
if ( maFont.GetAlign() != eAlign )
{
maFont.SetAlign( eAlign );
- mbNewFont = sal_True;
+ mbNewFont = true;
}
if( mpAlphaVDev )
@@ -7415,8 +7415,8 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
sal_Bool bOldMap = mbMap;
if( bOldMap )
{
- const_cast<OutputDevice&>(*this).mbMap = sal_False;
- const_cast<OutputDevice&>(*this).mbNewFont = sal_True;
+ const_cast<OutputDevice&>(*this).mbMap = false;
+ const_cast<OutputDevice&>(*this).mbNewFont = true;
}
SalLayout* pSalLayout = NULL;
@@ -7476,7 +7476,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector
{
// restore original font size and map mode
const_cast<OutputDevice&>(*this).mbMap = bOldMap;
- const_cast<OutputDevice&>(*this).mbNewFont = sal_True;
+ const_cast<OutputDevice&>(*this).mbNewFont = true;
}
if( bRet || (OUTDEV_PRINTER == meOutDevType) || !mpFontEntry )
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index c101ccc186b8..a18ce193dfde 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -660,10 +660,10 @@ void OutputDevice::DrawGradient( const Rectangle& rRect,
if ( mbLineColor || mbInitLineColor )
{
mpGraphics->SetLineColor();
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
}
- mbInitFillColor = sal_True;
+ mbInitFillColor = true;
// calculate step count if necessary
if ( !aGradient.GetSteps() )
@@ -820,10 +820,10 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
if( mbLineColor || mbInitLineColor )
{
mpGraphics->SetLineColor();
- mbInitLineColor = sal_True;
+ mbInitLineColor = true;
}
- mbInitFillColor = sal_True;
+ mbInitFillColor = true;
// calculate step count if necessary
if ( !aGradient.GetSteps() )
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 83234c2e6cfb..24b5747f9468 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -702,12 +702,12 @@ void OutputDevice::SetMapMode()
if ( mbMap || !maMapMode.IsDefault() )
{
- mbMap = sal_False;
+ mbMap = false;
maMapMode = MapMode();
// create new objects (clip region werden nicht neu skaliert)
- mbNewFont = sal_True;
- mbInitFont = sal_True;
+ mbNewFont = true;
+ mbInitFont = true;
if ( GetOutDevType() == OUTDEV_WINDOW )
{
if ( ((Window*)this)->mpWindowImpl->mpCursor )
@@ -806,8 +806,8 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode )
maMapMode = rNewMapMode;
// create new objects (clip region werden nicht neu skaliert)
- mbNewFont = sal_True;
- mbInitFont = sal_True;
+ mbNewFont = true;
+ mbInitFont = true;
if ( GetOutDevType() == OUTDEV_WINDOW )
{
if ( ((Window*)this)->mpWindowImpl->mpCursor )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 464062aadfd0..fbfdbb5fd191 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1801,7 +1801,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
// do not encrypt after all
m_aContext.Encryption.OValue.clear();
m_aContext.Encryption.UValue.clear();
- OSL_ENSURE( 0, "encryption data failed sanity check, encryption disabled" );
+ OSL_ENSURE( false, "encryption data failed sanity check, encryption disabled" );
}
else // setup key lengths
m_nAccessPermissions = computeAccessPermissions( m_aContext.Encryption, m_nKeyLength, m_nRC4KeyLength );
@@ -2202,7 +2202,7 @@ OutputDevice* PDFWriterImpl::getReferenceDevice()
pVDev->SetMapMode( MAP_MM );
m_pReferenceDevice->mpPDFWriter = this;
- m_pReferenceDevice->ImplUpdateFontData( sal_True );
+ m_pReferenceDevice->ImplUpdateFontData( true );
}
return m_pReferenceDevice;
}
@@ -2797,7 +2797,7 @@ bool PDFWriterImpl::emitGradients()
for( std::list<GradientEmit>::iterator it = m_aGradients.begin();
it != m_aGradients.end(); ++it )
{
- CHECK_RETURN( writeGradientFunction( *it ) );
+ if ( !writeGradientFunction( *it ) ) return false;
}
return true;
}
@@ -2882,8 +2882,8 @@ bool PDFWriterImpl::emitTilings()
aTilingObj.append( "/Length " );
aTilingObj.append( (sal_Int32)nTilingStreamSize );
aTilingObj.append( ">>\nstream\n" );
- CHECK_RETURN( updateObject( it->m_nObject ) );
- CHECK_RETURN( writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) );
+ if ( !updateObject( it->m_nObject ) ) return false;
+ if ( !writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) ) return false;
checkAndEnableStreamEncryption( it->m_nObject );
bool written = writeBuffer( it->m_pTilingStream->GetData(), nTilingStreamSize );
delete it->m_pTilingStream;
@@ -2893,7 +2893,7 @@ bool PDFWriterImpl::emitTilings()
disableStreamEncryption();
aTilingObj.setLength( 0 );
aTilingObj.append( "\nendstream\nendobj\n\n" );
- CHECK_RETURN( writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) );
+ if ( !writeBuffer( aTilingObj.getStr(), aTilingObj.getLength() ) ) return false;
}
return true;
}
@@ -3894,19 +3894,19 @@ bool PDFWriterImpl::emitFonts()
{
// create font stream
oslFileHandle aFontFile;
- CHECK_RETURN( (osl_File_E_None == osl_openFile( aTmpName.pData, &aFontFile, osl_File_OpenFlag_Read ) ) );
+ if ( osl_File_E_None != osl_openFile( aTmpName.pData, &aFontFile, osl_File_OpenFlag_Read ) ) return false;
// get file size
sal_uInt64 nLength1;
- CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_End, 0 ) ) );
- CHECK_RETURN( (osl_File_E_None == osl_getFilePos( aFontFile, &nLength1 ) ) );
- CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
+ if ( osl_File_E_None != osl_setFilePos( aFontFile, osl_Pos_End, 0 ) ) return false;
+ if ( osl_File_E_None != osl_getFilePos( aFontFile, &nLength1 ) ) return false;
+ if ( osl_File_E_None != osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) return false;
#if OSL_DEBUG_LEVEL > 1
emitComment( "PDFWriterImpl::emitFonts" );
#endif
sal_Int32 nFontStream = createObject();
sal_Int32 nStreamLengthObject = createObject();
- CHECK_RETURN( updateObject( nFontStream ) );
+ if ( !updateObject( nFontStream ) ) return false;
aLine.setLength( 0 );
aLine.append( nFontStream );
aLine.append( " 0 obj\n"
@@ -3925,8 +3925,8 @@ bool PDFWriterImpl::emitFonts()
aLine.append( ">>\n"
"stream\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
- CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
+ if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
+ if ( osl_File_E_None != osl_getFilePos( m_aFile, &nStartPos ) ) return false;
// copy font file
beginCompression();
@@ -3936,9 +3936,9 @@ bool PDFWriterImpl::emitFonts()
{
char buf[8192];
sal_uInt64 nRead;
- CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, buf, sizeof( buf ), &nRead ) ) );
- CHECK_RETURN( writeBuffer( buf, nRead ) );
- CHECK_RETURN( (osl_File_E_None == osl_isEndOfFile( aFontFile, &bEOF ) ) );
+ if ( osl_File_E_None != osl_readFile( aFontFile, buf, sizeof( buf ), &nRead ) ) return false;
+ if ( !writeBuffer( buf, nRead ) ) return false;
+ if ( osl_File_E_None != osl_isEndOfFile( aFontFile, &bEOF ) ) return false;
} while( ! bEOF );
}
else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::CFF_FONT) != 0 )
@@ -3951,9 +3951,9 @@ bool PDFWriterImpl::emitFonts()
boost::shared_array<unsigned char> pBuffer( new unsigned char[ nLength1 ] );
sal_uInt64 nBytesRead = 0;
- CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer.get(), nLength1, &nBytesRead ) ) );
+ if ( osl_File_E_None != osl_readFile( aFontFile, pBuffer.get(), nLength1, &nBytesRead ) ) return false;
DBG_ASSERT( nBytesRead==nLength1, "PDF-FontSubset read incomplete!" );
- CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
+ if ( osl_File_E_None != osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) return false;
// get the PFB-segment lengths
ThreeInts aSegmentLengths = {0,0,0};
getPfbSegmentLengths( pBuffer.get(), (int)nBytesRead, aSegmentLengths );
@@ -3967,15 +3967,15 @@ bool PDFWriterImpl::emitFonts()
aLine.append( ">>\n"
"stream\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
- CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
+ if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
+ if ( osl_File_E_None != osl_getFilePos( m_aFile, &nStartPos ) ) return false;
// emit PFB-sections without section headers
beginCompression();
checkAndEnableStreamEncryption( nFontStream );
- CHECK_RETURN( writeBuffer( &pBuffer[6], aSegmentLengths[0] ) );
- CHECK_RETURN( writeBuffer( &pBuffer[12] + aSegmentLengths[0], aSegmentLengths[1] ) );
- CHECK_RETURN( writeBuffer( &pBuffer[18] + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) );
+ if ( !writeBuffer( &pBuffer[6], aSegmentLengths[0] ) ) return false;
+ if ( !writeBuffer( &pBuffer[12] + aSegmentLengths[0], aSegmentLengths[1] ) ) return false;
+ if ( !writeBuffer( &pBuffer[18] + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) ) return false;
}
else
{
@@ -3989,20 +3989,20 @@ bool PDFWriterImpl::emitFonts()
osl_closeFile( aFontFile );
sal_uInt64 nEndPos = 0;
- CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nEndPos ) ) );
+ if ( osl_File_E_None != osl_getFilePos( m_aFile, &nEndPos ) ) return false;
// end the stream
aLine.setLength( 0 );
aLine.append( "\nendstream\nendobj\n\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
// emit stream length object
- CHECK_RETURN( updateObject( nStreamLengthObject ) );
+ if ( !updateObject( nStreamLengthObject ) ) return false;
aLine.setLength( 0 );
aLine.append( nStreamLengthObject );
aLine.append( " 0 obj\n" );
aLine.append( (sal_Int64)(nEndPos-nStartPos) );
aLine.append( "\nendobj\n\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
// write font descriptor
sal_Int32 nFontDescriptor = emitFontDescriptor( it->first, aSubsetInfo, lit->m_nFontID, nFontStream );
@@ -4011,7 +4011,7 @@ bool PDFWriterImpl::emitFonts()
nToUnicodeStream = createToUnicodeCMap( pEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nGlyphs );
sal_Int32 nFontObject = createObject();
- CHECK_RETURN( updateObject( nFontObject ) );
+ if ( !updateObject( nFontObject ) ) return false;
aLine.setLength( 0 );
aLine.append( nFontObject );
@@ -4043,7 +4043,7 @@ bool PDFWriterImpl::emitFonts()
}
aLine.append( ">>\n"
"endobj\n\n" );
- CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+ if ( !writeBuffer( aLine.getStr(), aLine.getLength() ) ) return false;
aFontIDToObject[ lit->m_nFontID ] = nFontObject;
}
@@ -4072,7 +4072,7 @@ bool PDFWriterImpl::emitFonts()
std::map< sal_Int32, sal_Int32 > aObjects = emitEmbeddedFont( eit->first, eit->second );
for( std::map< sal_Int32, sal_Int32 >::iterator fit = aObjects.begin(); fit != aObjects.end(); ++fit )
{
- CHECK_RETURN( fit->second );
+ if ( !fit->second ) return false;
aFontIDToObject[ fit->first ] = fit->second;
}
}
@@ -4083,7 +4083,7 @@ bool PDFWriterImpl::emitFonts()
std::map< sal_Int32, sal_Int32 > aObjects = emitSystemFont( sit->first, sit->second );
for( std::map< sal_Int32, sal_Int32 >::iterator fit = aObjects.begin(); fit != aObjects.end(); ++fit )
{
- CHECK_RETURN( fit->second );
+ if ( !fit->second ) return false;
aFontIDToObject[ fit->first ] = fit->second;
}
}
@@ -4113,8 +4113,8 @@ bool PDFWriterImpl::emitFonts()
appendBuiltinFontsToDict( aFontDict );
aFontDict.append( "\n>>\nendobj\n\n" );
- CHECK_RETURN( updateObject( getFontDictObject() ) );
- CHECK_RETURN( writeBuffer( aFontDict.getStr(), aFontDict.getLength() ) );
+ if ( !updateObject( getFontDictObject() ) ) return false;
+ if ( !writeBuffer( aFontDict.getStr(), aFontDict.getLength() ) ) return false;
return true;
}
@@ -6808,7 +6808,7 @@ void PDFWriterImpl::sortWidgets()
}
else
{
- DBG_ASSERT( 0, "wrong number of sorted annotations" );
+ DBG_ASSERT( false, "wrong number of sorted annotations" );
#if OSL_DEBUG_LEVEL > 0
fprintf( stderr, "PDFWriterImpl::sortWidgets(): wrong number of sorted assertions on page nr %ld\n"
" %ld sorted and %ld unsorted\n", (long int)it->first, (long int)it->second.aSortedAnnots.size(), (long int)nAnnots );
@@ -11087,7 +11087,7 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType,
if( childType == PDFWriter::Document )
{
m_nCurrentStructElement = nNewCurElement;
- DBG_ASSERT( 0, "Structure element inserted to StructTreeRoot that is not a document" );
+ DBG_ASSERT( false, "Structure element inserted to StructTreeRoot that is not a document" );
}
else {
OSL_FAIL( "document structure in disorder !" );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c423e0cd02e7..5fd03256fa84 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -413,7 +413,7 @@ OUString Printer::GetDefaultPrinterName()
void Printer::ImplInitData()
{
- mbDevOutput = sal_False;
+ mbDevOutput = false;
meOutDevType = OUTDEV_PRINTER;
mbDefPrinter = sal_False;
mnError = 0;
@@ -579,7 +579,7 @@ void Printer::ImplUpdatePageData()
void Printer::ImplUpdateFontList()
{
- ImplUpdateFontData( sal_True );
+ ImplUpdateFontData( true );
}
@@ -831,8 +831,8 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter )
mpFontCache = NULL;
mpFontList = NULL;
- mbInitFont = sal_True;
- mbNewFont = sal_True;
+ mbInitFont = true;
+ mbNewFont = true;
mpInfoPrinter = NULL;
}
@@ -873,8 +873,8 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter )
delete mpFontList;
mpFontCache = NULL;
mpFontList = NULL;
- mbInitFont = sal_True;
- mbNewFont = sal_True;
+ mbInitFont = true;
+ mbNewFont = true;
mpInfoPrinter = NULL;
}
@@ -1352,7 +1352,7 @@ sal_Bool Printer::EndJob()
mnCurPrintPage = 0;
maJobName = OUString();
- mbDevOutput = sal_False;
+ mbDevOutput = false;
bRet = mpPrinter->EndJob();
// FIXME: Do not destroy the printer asynchronously as Win95
// can't handle destroying a printer object and printing
@@ -1378,7 +1378,7 @@ void Printer::ImplStartPage()
ImplReleaseGraphics();
mpJobGraphics = pGraphics;
}
- mbDevOutput = sal_True;
+ mbDevOutput = true;
// PrintJob not aborted ???
if ( IsJobActive() )
@@ -1402,7 +1402,7 @@ void Printer::ImplEndPage()
{
mpPrinter->EndPage();
ImplReleaseGraphics();
- mbDevOutput = sal_False;
+ mbDevOutput = false;
mpJobGraphics = NULL;
mbNewJobSetup = sal_False;
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index a905cca6c5be..16b035cfa2de 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1255,7 +1255,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
}
const sal_Bool bOldMap = mbMap;
- mbMap = aPaintVDev.mbMap = sal_False;
+ mbMap = aPaintVDev.mbMap = false;
Bitmap aBandBmp( aPaintVDev.GetBitmap( Point(), aDstSzPix ) );
@@ -1271,7 +1271,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
rOutMtf.AddAction( new MetaBmpScaleAction( aDstPtPix, aDstSzPix, aBandBmp ) );
rOutMtf.AddAction( new MetaCommentAction( "PRNSPOOL_TRANSPARENTBITMAP_END" ) );
- aPaintVDev.mbMap = sal_True;
+ aPaintVDev.mbMap = true;
mbMap = bOldMap;
aMapVDev.Pop();
aPaintVDev.Pop();
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 26c5d13e01e7..fa418b89caf7 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -524,14 +524,14 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print
mnError = PRINTER_OK;
if ( IsDisplayPrinter() )
- return sal_False;
+ return false;
if ( IsJobActive() || IsPrinting() )
- return sal_False;
+ return false;
sal_uLong nCopies = mnCopyCount;
bool bCollateCopy = mbCollateCopy;
- bool bUserCopy = sal_False;
+ bool bUserCopy = false;
if ( nCopies > 1 )
{
@@ -545,20 +545,20 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print
// need to do copies by hand ?
if ( nCopies > nDevCopy )
{
- bUserCopy = sal_True;
+ bUserCopy = true;
nCopies = 1;
- bCollateCopy = sal_False;
+ bCollateCopy = false;
}
}
else
- bCollateCopy = sal_False;
+ bCollateCopy = false;
ImplSVData* pSVData = ImplGetSVData();
mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter );
if ( !mpPrinter )
- return sal_False;
+ return false;
sal_Bool bSinglePrintJobs = sal_False;
beans::PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) );
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 423505a35f8b..5786480c0296 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -129,7 +129,7 @@ void SvgData::ensureSequenceAndRange()
}
catch(const uno::Exception&)
{
- OSL_ENSURE(sal_False, "Got no graphic::XSvgParser (!)" );
+ OSL_ENSURE(false, "Got no graphic::XSvgParser (!)" );
}
}
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 4ef472047e02..cc0cc1683fc8 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -92,7 +92,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
mbScreenComp = ((VirtualDevice*)pOutDev)->mbScreenComp;
meOutDevType = OUTDEV_VIRDEV;
- mbDevOutput = sal_True;
+ mbDevOutput = true;
mpFontList = pSVData->maGDIData.mpScreenFontList;
mpFontCache = pSVData->maGDIData.mpScreenFontCache;
mnDPIX = pOutDev->mnDPIX;
@@ -383,7 +383,7 @@ void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode )
{
case REFDEV_NONE:
default:
- DBG_ASSERT( sal_False, "VDev::SetRefDev illegal argument!" );
+ DBG_ASSERT( false, "VDev::SetRefDev illegal argument!" );
break;
case REFDEV_MODE06:
nDPIX = nDPIY = 600;
@@ -413,8 +413,8 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
mbScreenComp = sal_False;
// invalidate currently selected fonts
- mbInitFont = sal_True;
- mbNewFont = sal_True;
+ mbInitFont = true;
+ mbNewFont = true;
// avoid adjusting font lists when already in refdev mode
sal_uInt8 nOldRefDevMode = meRefDevMode;
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 297d98b85353..3b7bbab66562 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -143,7 +143,7 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
// version 3 (new color format)
if( aCompat.GetVersion() >= 3 )
{
- rImplWallpaper.maColor.Read( rIStm, sal_True );
+ rImplWallpaper.maColor.Read( rIStm, true );
}
}
@@ -177,7 +177,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap
WriteDIBBitmapEx(*rImplWallpaper.mpBitmap, rOStm);
// version 3 (new color format)
- ( (Color&) rImplWallpaper.maColor ).Write( rOStm, sal_True );
+ ( (Color&) rImplWallpaper.maColor ).Write( rOStm, true );
return rOStm;
}
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 27cee445e905..a70bd1e74568 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -440,7 +440,7 @@ sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData,
if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
{
SystemWindow* pClientWindow = (SystemWindow*)(pBorderWindow->ImplGetClientWindow());
- if ( sal_True /*pBorderWindow->mbDockBtn*/ ) // always perform docking on double click, no button required
+ if ( true /*pBorderWindow->mbDockBtn*/ ) // always perform docking on double click, no button required
pClientWindow->TitleButtonClick( TITLE_BUTTON_DOCKING );
else if ( pBorderWindow->GetStyle() & WB_ROLLABLE )
{
@@ -1868,26 +1868,26 @@ void ImplBorderWindow::ImplInit( Window* pParent,
nTestStyle |= WB_APP;
nStyle &= nTestStyle;
- mpWindowImpl->mbBorderWin = sal_True;
+ mpWindowImpl->mbBorderWin = true;
mbSmallOutBorder = sal_False;
if ( nTypeStyle & BORDERWINDOW_STYLE_FRAME )
{
if( (nStyle & WB_SYSTEMCHILDWINDOW) )
{
- mpWindowImpl->mbOverlapWin = sal_True;
- mpWindowImpl->mbFrame = sal_True;
+ mpWindowImpl->mbOverlapWin = true;
+ mpWindowImpl->mbFrame = true;
mbFrameBorder = sal_False;
}
else if( (nStyle & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
{
- mpWindowImpl->mbOverlapWin = sal_True;
- mpWindowImpl->mbFrame = sal_True;
+ mpWindowImpl->mbOverlapWin = true;
+ mpWindowImpl->mbFrame = true;
mbFrameBorder = (nOrgStyle & WB_NOBORDER) ? sal_False : sal_True;
}
else
{
- mpWindowImpl->mbOverlapWin = sal_True;
- mpWindowImpl->mbFrame = sal_True;
+ mpWindowImpl->mbOverlapWin = true;
+ mpWindowImpl->mbFrame = true;
mbFrameBorder = sal_False;
// closeable windows may have a border as well, eg. system floating windows without caption
if ( (nOrgStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE/* | WB_CLOSEABLE*/)) == WB_BORDER )
@@ -1896,7 +1896,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
}
else if ( nTypeStyle & BORDERWINDOW_STYLE_OVERLAP )
{
- mpWindowImpl->mbOverlapWin = sal_True;
+ mpWindowImpl->mbOverlapWin = true;
mbFrameBorder = sal_True;
}
else
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 212b5c65df1e..af5bead656c2 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -273,7 +273,7 @@ void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
// PageItem anlegen
ImplBtnDlgItem* pItem = new ImplBtnDlgItem;
pItem->mnId = nId;
- pItem->mbOwnButton = sal_True;
+ pItem->mbOwnButton = true;
pItem->mnSepSize = nSepPixel;
pItem->mpPushButton = ImplCreatePushButton( nBtnFlags );
@@ -294,7 +294,7 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId,
// PageItem anlegen
ImplBtnDlgItem* pItem = new ImplBtnDlgItem;
pItem->mnId = nId;
- pItem->mbOwnButton = sal_True;
+ pItem->mbOwnButton = true;
pItem->mnSepSize = nSepPixel;
if ( eType == BUTTON_OK )
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5aac570883dd..de88c5b5b3f9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -505,7 +505,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
OString sID, sProperty;
- while(1)
+ while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_RAW, &name, &nsId);
@@ -1679,7 +1679,7 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader)
int nLevel = 1;
stringmap aProperties;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -1831,7 +1831,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
}
int nLevel = 1;
- while(1)
+ while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
@@ -2011,7 +2011,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
ListStore::row aRow;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -2074,7 +2074,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI
int nLevel = 1;
sal_Int32 nRowIndex = 0;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -2111,7 +2111,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
stringmap aProperties;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -2157,7 +2157,7 @@ std::vector<OString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const
std::vector<OString> aItems;
sal_Int32 nItemIndex = 0;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -2222,7 +2222,7 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID)
stringmap aProperties;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -2265,7 +2265,7 @@ void VclBuilder::handleMenuChild(PopupMenu *pParent, xmlreader::XmlReader &reade
int nsId;
int nLevel = 1;
- while(1)
+ while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
@@ -2327,7 +2327,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read
if (!sCustomProperty.isEmpty())
aProperties[OString("customproperty")] = sCustomProperty;
- while(1)
+ while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
@@ -2363,7 +2363,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI
int nLevel = 1;
- while(1)
+ while(true)
{
xmlreader::Span name;
int nsId;
@@ -2562,7 +2562,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader)
aProperties[OString("customproperty")] = sCustomProperty;
Window *pCurrentChild = NULL;
- while(1)
+ while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
@@ -2633,7 +2633,7 @@ void VclBuilder::handlePacking(Window *pCurrent, xmlreader::XmlReader &reader)
int nLevel = 1;
- while(1)
+ while(true)
{
xmlreader::XmlReader::Result res = reader.nextItem(
xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 88439c970366..13a1da892dcd 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -351,7 +351,7 @@ struct DialogImpl
void Dialog::ImplInitDialogData()
{
- mpWindowImpl->mbDialog = sal_True;
+ mpWindowImpl->mbDialog = true;
mpDialogParent = NULL;
mpPrevExecuteDlg = NULL;
mbInExecute = sal_False;
@@ -432,8 +432,8 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
}
else
{
- mpWindowImpl->mbFrame = sal_True;
- mpWindowImpl->mbOverlapWin = sal_True;
+ mpWindowImpl->mbFrame = true;
+ mpWindowImpl->mbOverlapWin = true;
SystemWindow::ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE | WB_STANDALONE)) | WB_CLOSEABLE, NULL );
// Now set all style bits
mpWindowImpl->mnStyle = nStyle;
@@ -857,7 +857,7 @@ sal_Bool Dialog::ImplStartExecuteModal()
pSVData->maWinData.mpTrackWin->EndTracking( ENDTRACK_CANCEL );
if ( pSVData->maWinData.mpCaptureWin )
pSVData->maWinData.mpCaptureWin->ReleaseMouse();
- EnableInput( sal_True, sal_True );
+ EnableInput( true, sal_True );
if ( GetParent() )
{
@@ -1100,7 +1100,7 @@ void Dialog::SetModalInputMode( sal_Bool bModal )
// before the other dialog can be closed (because the other dialog
// is on stack since our dialog returns)
if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, sal_True ) )
- mpPrevExecuteDlg->EnableInput( sal_False, sal_True, sal_True, this );
+ mpPrevExecuteDlg->EnableInput( false, sal_True, sal_True, this );
// determine next overlap dialog parent
Window* pParent = GetParent();
@@ -1129,7 +1129,7 @@ void Dialog::SetModalInputMode( sal_Bool bModal )
// Enable the prev Modal Dialog
if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, sal_True ) )
{
- mpPrevExecuteDlg->EnableInput( sal_True, sal_True, sal_True, this );
+ mpPrevExecuteDlg->EnableInput( true, sal_True, sal_True, this );
// ensure continued modality of prev dialog
// do not change modality counter
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 29f02ea5530e..7c025440f32d 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -387,7 +387,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt
if ( nIteration >= 2 )
{
// this is an unexpected scenario
- DBG_ASSERT( sal_False, "It seems to be an endless loop!" );
+ DBG_ASSERT( false, "It seems to be an endless loop!" );
rFormStart = 0;
break;
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index dc1cc0cbb688..8aee080b850d 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -94,7 +94,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
if ( pDockingWin )
{
SetSettings( pDockingWin->GetWindow()->GetSettings() );
- Enable( pDockingWin->GetWindow()->IsEnabled(), sal_False );
+ Enable( pDockingWin->GetWindow()->IsEnabled(), false );
EnableInput( pDockingWin->GetWindow()->IsInputEnabled(), sal_False );
AlwaysEnableInput( pDockingWin->GetWindow()->IsAlwaysEnableInput(), sal_False );
EnableAlwaysOnTop( pDockingWin->GetWindow()->IsAlwaysOnTopEnabled() );
@@ -552,13 +552,13 @@ public:
ImplPopupFloatWin::ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) :
FloatingWindow( pParent, WB_NOBORDER | WB_SYSTEMWINDOW | WB_NOSHADOW)
{
- mpWindowImpl->mbToolbarFloatingWindow = sal_True; // indicate window type, required for accessibility
+ mpWindowImpl->mbToolbarFloatingWindow = true; // indicate window type, required for accessibility
// which should not see this window as a toplevel window
mpDockingWin = pDockingWin;
mbHighlight = false;
mbMoving = false;
- mbTrackingEnabled = sal_False;
- mbGripAtBottom = sal_True;
+ mbTrackingEnabled = false;
+ mbGripAtBottom = true;
mbHasGrip = bHasGrip;
ImplSetBorder();
@@ -859,7 +859,7 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
{
if ( IsFloatingMode() )
{
- GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
SetFloatingMode( sal_False );
}
}
@@ -1065,7 +1065,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, sal_Bool bFlo
bool bShow = false;
if ( bFloatMode != IsFloatingMode() )
{
- GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
SetFloatingMode( bFloatMode );
bShow = true;
if ( bFloatMode )
@@ -1083,7 +1083,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, sal_Bool bFlo
}
if ( bShow )
- GetWindow()->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ GetWindow()->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
EndDockingData data( aRect, IsFloatingMode(), IsDockingCanceled() );
@@ -1201,7 +1201,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon
if( IsFloatingMode() )
return;
- GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
// prepare reparenting
Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT );
@@ -1258,7 +1258,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon
IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
{
- GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
// set parameter for handler before destroying floating window
ImplPopupFloatWin *pPopupFloatWin = (ImplPopupFloatWin*) mpFloatWin;
@@ -1313,7 +1313,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( sal_Bool bFloatMode )
if ( bFloatMode )
{
- GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
maDockPos = GetWindow()->GetPosPixel();
@@ -1366,13 +1366,13 @@ void ImplDockingWindowWrapper::SetFloatingMode( sal_Bool bFloatMode )
mpFloatWin = pWin;
if ( bVisible )
- GetWindow()->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ GetWindow()->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
ToggleFloatingMode();
}
else
{
- GetWindow()->Show( sal_False, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
// FloatingDaten wird im FloatingWindow speichern
maFloatPos = mpFloatWin->GetPosPixel();
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 12379f060649..957423f1259a 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -107,7 +107,7 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits,
if ( pDockingWin )
{
SetSettings( pDockingWin->GetSettings() );
- Enable( pDockingWin->IsEnabled(), sal_False );
+ Enable( pDockingWin->IsEnabled(), false );
EnableInput( pDockingWin->IsInputEnabled(), sal_False );
AlwaysEnableInput( pDockingWin->IsAlwaysEnableInput(), sal_False );
EnableAlwaysOnTop( pDockingWin->IsAlwaysOnTopEnabled() );
@@ -335,7 +335,7 @@ sal_Bool DockingWindow::ImplStartDocking( const Point& rPos )
void DockingWindow::ImplInitDockingWindowData()
{
mpImplData = new ImplData;
- mpWindowImpl->mbDockWin = sal_True;
+ mpWindowImpl->mbDockWin = true;
mpFloatWin = NULL;
mbDockCanceled = sal_False;
@@ -466,7 +466,7 @@ DockingWindow::~DockingWindow()
{
if ( IsFloatingMode() )
{
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
SetFloatingMode( sal_False );
}
delete mpImplData;
@@ -671,7 +671,7 @@ void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
bool bShow = false;
if ( bFloatMode != IsFloatingMode() )
{
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
SetFloatingMode( bFloatMode );
bShow = true;
if ( bFloatMode && mpFloatWin )
@@ -711,7 +711,7 @@ sal_Bool DockingWindow::Close()
if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() )
return sal_False;
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
return sal_True;
}
@@ -805,7 +805,7 @@ void DockingWindow::SetFloatingMode( sal_Bool bFloatMode )
if ( bFloatMode )
{
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
maDockPos = Window::GetPosPixel();
@@ -859,7 +859,7 @@ void DockingWindow::SetFloatingMode( sal_Bool bFloatMode )
}
else
{
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
// FloatingDaten wird im FloatingWindow speichern
maFloatPos = mpFloatWin->GetPosPixel();
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 6ff72f93f364..8f614f31535c 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -65,7 +65,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
{
mpImplData = new ImplData;
- mpWindowImpl->mbFloatWin = sal_True;
+ mpWindowImpl->mbFloatWin = true;
mbInCleanUp = sal_False;
mbGrabFocus = sal_False;
@@ -79,7 +79,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
// no Border, then we dont need a border window
if ( !nStyle )
{
- mpWindowImpl->mbOverlapWin = sal_True;
+ mpWindowImpl->mbOverlapWin = true;
nStyle |= WB_DIALOGCONTROL;
SystemWindow::ImplInit( pParent, nStyle, NULL );
}
@@ -94,8 +94,8 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
WinBits nFloatWinStyle = nStyle;
// #99154# floaters are not closeable by default anymore, eg fullscreen floater
// nFloatWinStyle |= WB_CLOSEABLE;
- mpWindowImpl->mbFrame = sal_True;
- mpWindowImpl->mbOverlapWin = sal_True;
+ mpWindowImpl->mbFrame = true;
+ mpWindowImpl->mbOverlapWin = true;
SystemWindow::ImplInit( pParent, nFloatWinStyle & ~WB_BORDER, NULL );
}
else
@@ -649,7 +649,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
{
// avoid flickering
if ( IsVisible() )
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
if ( IsRollUp() )
RollDown();
@@ -722,7 +722,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
// force key input even without focus (useful for menus)
mbGrabFocus = sal_True;
}
- Show( sal_True, SHOW_NOACTIVATE );
+ Show( true, SHOW_NOACTIVATE );
}
// -----------------------------------------------------------------------
@@ -798,7 +798,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
if ( !(nFlags & FLOATWIN_POPUPMODEEND_TEAROFF) ||
!(nPopupModeFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF) )
{
- Show( sal_False, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
// Focus evt. auf ein entsprechendes FloatingWindow weiterschalten
if ( nFocusId )
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 8287d7e9f993..c2de81b8b085 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1876,7 +1876,7 @@ void Menu::ShowItem( sal_uInt16 nItemId, sal_Bool bVisible )
Window* pWin = ImplGetWindow();
if ( pWin && pWin->IsVisible() )
{
- DBG_ASSERT( 0, "Menu::ShowItem - ignored for visible popups!" );
+ DBG_ASSERT( false, "Menu::ShowItem - ignored for visible popups!" );
return;
}
pData->bVisible = bVisible;
@@ -3969,7 +3969,7 @@ static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar )
MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nStyle ) :
FloatingWindow( pParent, nStyle )
{
- mpWindowImpl->mbMenuFloatingWindow= sal_True;
+ mpWindowImpl->mbMenuFloatingWindow= true;
pMenu = pMen;
pActivePopup = 0;
nSaveFocusId = 0;
@@ -6162,7 +6162,7 @@ bool MenuBarWindow::HandleMenuButtonEvent( sal_uInt16 i_nButtonId )
aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu);
return it->second.m_aSelectLink.Call( &aArg );
}
- return sal_False;
+ return false;
}
ImplMenuDelData::ImplMenuDelData( const Menu* pMenu )
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b19a53c1ba55..28d86623b0fd 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -436,7 +436,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
{
mpNupOrderWin->Show();
mpPagesBtn->Check( sal_True );
- mpBrochureBtn->Show( sal_False );
+ mpBrochureBtn->Show( false );
// setup field units for metric fields
const LocaleDataWrapper& rLocWrap( mpPageMarginEdt->GetLocaleDataWrapper() );
@@ -509,7 +509,7 @@ void PrintDialog::JobTabPage::readFromSettings()
{
mnCollateUIMode = 1;
mpCollateBox->Check( sal_False );
- mpCollateBox->Enable( sal_False );
+ mpCollateBox->Enable( false );
}
else
{
@@ -1039,7 +1039,7 @@ void PrintDialog::setupOptionalUI()
pBtn->Check( m == nSelectVal );
pBtn->SetToggleHdl( LINK( this, PrintDialog, UIOption_RadioHdl ) );
if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] == sal_True )
- pBtn->Enable( sal_False );
+ pBtn->Enable( false );
pBtn->Show();
maPropertyToWindowMap[ aPropertyName ].push_back( pBtn );
maControlToPropertyMap[pBtn] = aPropertyName;
@@ -1145,8 +1145,8 @@ void PrintDialog::setupOptionalUI()
if (!maNUpPage.mpBrochureBtn->IsVisible() && maNUpPage.mpPagesBtn->IsVisible())
{
maNUpPage.mpPagesBoxTitleTxt->SetText( maNUpPage.mpPagesBtn->GetText() );
- maNUpPage.mpPagesBoxTitleTxt->Show( sal_True );
- maNUpPage.mpPagesBtn->Show( sal_False );
+ maNUpPage.mpPagesBoxTitleTxt->Show( true );
+ maNUpPage.mpPagesBtn->Show( false );
}
// update enable states
@@ -1157,8 +1157,8 @@ void PrintDialog::setupOptionalUI()
// print range not shown (currently math only) -> hide spacer line and reverse order
if (!pPageRange || !pPageRange->IsVisible())
{
- maJobPage.mpCopySpacer->Show( sal_False );
- maJobPage.mpReverseOrderBox->Show( sal_False );
+ maJobPage.mpCopySpacer->Show( false );
+ maJobPage.mpReverseOrderBox->Show( false );
}
if (!mpCustomOptionsUIBuilder)
@@ -1178,7 +1178,7 @@ void PrintDialog::checkControlDependencies()
if( maJobPage.mpCopyCountField->GetValue() > 1 )
maJobPage.mpCollateBox->Enable( maJobPage.mnCollateUIMode == 0 );
else
- maJobPage.mpCollateBox->Enable( sal_False );
+ maJobPage.mpCollateBox->Enable( false );
Image aImg( maJobPage.mpCollateBox->IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg );
@@ -1679,7 +1679,7 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty )
}
else
{
- DBG_ASSERT( 0, "missing a checkbox" );
+ DBG_ASSERT( false, "missing a checkbox" );
}
}
else if( pValue->Value >>= nVal )
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 9fd833ccfb84..6796d0a6711a 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -93,7 +93,7 @@ void ImplWheelWindow::ImplStop()
{
ReleaseMouse();
mpTimer->Stop();
- Show(sal_False);
+ Show(false);
}
void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp )
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl)
const Point aMousePos( pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() ) );
Point aCmdMousePos( pWindow->ImplFrameToOutput( aMousePos ) );
CommandScrollData aScrollData( mnActDeltaX, mnActDeltaY );
- CommandEvent aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, sal_True, &aScrollData );
+ CommandEvent aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, true, &aScrollData );
NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
if ( !ImplCallPreNotify( aNCmdEvt ) )
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index f21e3b3083ed..3ed8c0d86c97 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -52,7 +52,7 @@ namespace
void Splitter::ImplInitSplitterData()
{
- ImplGetWindowImpl()->mbSplitter = sal_True;
+ ImplGetWindowImpl()->mbSplitter = true;
mpRefWin = NULL;
mnSplitPos = 0;
mnLastSplitPos = 0;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 31e1313ead7f..6b03cf7115a8 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -67,7 +67,7 @@ SystemWindow::SystemWindow( WindowType nType ) :
Window( nType )
{
mpImplData = new ImplData;
- mpWindowImpl->mbSysWin = sal_True;
+ mpWindowImpl->mbSysWin = true;
mpWindowImpl->mnActivateMode = ACTIVATE_MODE_GRABFOCUS;
mpMenuBar = NULL;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index bb91d10c6b97..c0361a759ae3 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -713,7 +713,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
{
pThis->mpData->mbAssumeDocked = sal_True; // force non-floating mode during calculation
ImplCalcBorder( WINDOWALIGN_TOP, nLeft, nTop, nRight, nBottom, pThis );
- ((ToolBox*)pThis)->mbHorz = sal_True;
+ ((ToolBox*)pThis)->mbHorz = true;
if ( pThis->mbHorz != bOldHorz )
((ToolBox*)pThis)->meAlign = WINDOWALIGN_TOP;
}
@@ -721,7 +721,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
{
pThis->mpData->mbAssumeDocked = sal_True; // force non-floating mode during calculation
ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight, nBottom, pThis );
- ((ToolBox*)pThis)->mbHorz = sal_False;
+ ((ToolBox*)pThis)->mbHorz = false;
if ( pThis->mbHorz != bOldHorz )
((ToolBox*)pThis)->meAlign = WINDOWALIGN_LEFT;
}
@@ -729,14 +729,14 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
{
pThis->mpData->mbAssumeFloating = sal_True; // force non-floating mode during calculation
nLeft = nTop = nRight = nBottom = 0;
- ((ToolBox*)pThis)->mbHorz = sal_True;
+ ((ToolBox*)pThis)->mbHorz = true;
if ( pThis->mbHorz != bOldHorz )
((ToolBox*)pThis)->meAlign = WINDOWALIGN_TOP;
}
if ( (pThis->meAlign != eOldAlign) || (pThis->mbHorz != bOldHorz) ||
(pThis->ImplIsFloatingMode() != bOldFloatingMode ) )
- ((ToolBox*)pThis)->mbCalc = sal_True;
+ ((ToolBox*)pThis)->mbCalc = true;
}
else
ImplCalcBorder( pThis->meAlign, nLeft, nTop, nRight, nBottom, pThis );
@@ -798,7 +798,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
{
((ToolBox*)pThis)->meAlign = eOldAlign;
((ToolBox*)pThis)->mbHorz = bOldHorz;
- ((ToolBox*)pThis)->mbCalc = sal_True;
+ ((ToolBox*)pThis)->mbCalc = true;
}
}
@@ -1233,7 +1233,7 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
{
mpDragBox = pToolBox;
pToolBox->CaptureMouse();
- pToolBox->mbDragging = sal_True;
+ pToolBox->mbDragging = true;
Application::InsertAccel( &maAccel );
if ( nDragLineMode )
@@ -1309,7 +1309,7 @@ void ImplTBDragMgr::EndDragging( sal_Bool bOK )
{
mpDragBox->HideTracking();
mpDragBox->ReleaseMouse();
- mpDragBox->mbDragging = sal_False;
+ mpDragBox->mbDragging = false;
mbShowDragRect = sal_False;
Application::RemoveAccel( &maAccel );
@@ -1420,7 +1420,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
{
// initialize variables
- ImplGetWindowImpl()->mbToolBox = sal_True;
+ ImplGetWindowImpl()->mbToolBox = true;
mpData = new ImplToolBoxPrivateData;
mpFloatWin = NULL;
mnDX = 0;
@@ -1447,24 +1447,24 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
mnConfigItem = 0;
mnMouseClicks = 0;
mnMouseModifier = 0;
- mbDrag = sal_False;
- mbSelection = sal_False;
- mbCommandDrag = sal_False;
- mbUpper = sal_False;
- mbLower = sal_False;
- mbIn = sal_False;
- mbCalc = sal_True;
- mbFormat = sal_False;
- mbFullPaint = sal_False;
- mbHorz = sal_True;
+ mbDrag = false;
+ mbSelection = false;
+ mbCommandDrag = false;
+ mbUpper = false;
+ mbLower = false;
+ mbIn = false;
+ mbCalc = true;
+ mbFormat = false;
+ mbFullPaint = false;
+ mbHorz = true;
mbScroll = (nStyle & WB_SCROLL) != 0;
- mbCustomize = sal_False;
- mbCustomizeMode = sal_False;
- mbDragging = sal_False;
- mbMenuStrings = sal_False;
- mbIsShift = sal_False;
- mbIsKeyEvent = sal_False;
- mbChangingHighlight = sal_False;
+ mbCustomize = false;
+ mbCustomizeMode = false;
+ mbDragging = false;
+ mbMenuStrings = false;
+ mbIsShift = false;
+ mbIsKeyEvent = false;
+ mbChangingHighlight = false;
meButtonType = BUTTON_SYMBOL;
meAlign = WINDOWALIGN_TOP;
meLastStyle = POINTER_ARROW;
@@ -1642,7 +1642,7 @@ ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
// calculate size of floating windows and switch if the
// toolbox is initially in floating mode
if ( ImplIsFloatingMode() )
- mbHorz = sal_True;
+ mbHorz = true;
else
Resize();
@@ -1989,8 +1989,8 @@ sal_Bool ToolBox::ImplCalcItem()
nMaxWidth = nFixedWidth;
}
- mbCalc = sal_False;
- mbFormat = sal_True;
+ mbCalc = false;
+ mbFormat = true;
// do we have to recalc the sizes ?
if ( (nMaxWidth != mnMaxItemWidth) || (nMaxHeight != mnMaxItemHeight) )
@@ -2705,7 +2705,7 @@ void ToolBox::ImplFormat( sal_Bool bResize )
}
// indicate formatting is done
- mbFormat = sal_False;
+ mbFormat = false;
}
// -----------------------------------------------------------------------
@@ -3403,7 +3403,7 @@ void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow )
// redraw item, to trigger drawing of a special border
ImplDrawItem( mnCurPos, 1 );
- mbDrag = sal_False;
+ mbDrag = false;
EndTracking();
ReleaseMouse();
}
@@ -3436,7 +3436,7 @@ void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow )
void ToolBox::ShowLine( sal_Bool bNext )
{
- mbFormat = sal_True;
+ mbFormat = true;
if ( mpData->mbPageScroll )
{
@@ -3554,10 +3554,10 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa
Deactivate();
if ( mbDrag )
- mbDrag = sal_False;
+ mbDrag = false;
else
{
- mbSelection = sal_False;
+ mbSelection = false;
if ( mnCurPos == TOOLBOX_ITEM_NOTFOUND )
return sal_True;
}
@@ -3636,9 +3636,9 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa
{
if ( mbIn )
ShowLine( !mbUpper );
- mbUpper = sal_False;
- mbLower = sal_False;
- mbIn = sal_False;
+ mbUpper = false;
+ mbLower = false;
+ mbIn = false;
ImplDrawSpin( sal_False, sal_False );
return sal_True;
}
@@ -3960,7 +3960,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
else
{
// update bDrag here, as it is evaluated in the EndSelection
- mbDrag = sal_True;
+ mbDrag = true;
// on double-click: only call the handler, but do so before the button
// is hit, as in the handler dragging
@@ -4041,8 +4041,8 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( mnCurLine > 1 )
{
StartTracking();
- mbUpper = sal_True;
- mbIn = sal_True;
+ mbUpper = true;
+ mbIn = true;
ImplDrawSpin( sal_True, sal_False );
}
return;
@@ -4052,8 +4052,8 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( mnCurLine+mnVisLines-1 < mnCurLines )
{
StartTracking();
- mbLower = sal_True;
- mbIn = sal_True;
+ mbLower = true;
+ mbIn = true;
ImplDrawSpin( sal_False, sal_True );
}
return;
@@ -4106,7 +4106,7 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt )
pMgr->EndDragging();
return;
}
- mbCommandDrag = sal_False;
+ mbCommandDrag = false;
DockingWindow::MouseButtonUp( rMEvt );
}
@@ -4137,9 +4137,9 @@ void ToolBox::Paint( const Rectangle& rPaintRect )
if( mpData->mbIsPaintLocked )
return;
if ( rPaintRect == Rectangle( 0, 0, mnDX-1, mnDY-1 ) )
- mbFullPaint = sal_True;
+ mbFullPaint = true;
ImplFormat();
- mbFullPaint = sal_False;
+ mbFullPaint = false;
ImplDrawBackground( this, rPaintRect );
@@ -4217,7 +4217,7 @@ void ToolBox::Resize()
{
if ( !mbFormat )
{
- mbFormat = sal_True;
+ mbFormat = true;
if( IsReallyVisible() )
ImplFormat( sal_True );
}
@@ -4464,7 +4464,7 @@ void ToolBox::Command( const CommandEvent& rCEvt )
// the item has been disabled
if ( (it->meType == TOOLBOXITEM_BUTTON) &&
!it->mbShowWindow )
- mbCommandDrag = sal_True;
+ mbCommandDrag = true;
break;
}
@@ -4518,8 +4518,8 @@ void ToolBox::StateChanged( StateChangedType nType )
else if ( (nType == STATE_CHANGE_ZOOM) ||
(nType == STATE_CHANGE_CONTROLFONT) )
{
- mbCalc = sal_True;
- mbFormat = sal_True;
+ mbCalc = true;
+ mbFormat = true;
ImplInitSettings( sal_True, sal_False, sal_False );
Invalidate();
}
@@ -4550,8 +4550,8 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE)) )
{
- mbCalc = sal_True;
- mbFormat = sal_True;
+ mbCalc = true;
+ mbFormat = true;
ImplInitSettings( sal_True, sal_True, sal_True );
Invalidate();
}
@@ -4577,12 +4577,12 @@ void ToolBox::ToggleFloatingMode()
if ( ImplIsFloatingMode() )
{
- mbHorz = sal_True;
+ mbHorz = true;
meAlign = WINDOWALIGN_TOP;
- mbScroll = sal_True;
+ mbScroll = true;
if( mbOldHorz != mbHorz )
- mbCalc = sal_True; // orientation was changed !
+ mbCalc = true; // orientation was changed !
ImplSetMinMaxFloatSize( this );
SetOutputSizePixel( ImplCalcFloatSize( this, mnFloatLines ) );
@@ -4591,9 +4591,9 @@ void ToolBox::ToggleFloatingMode()
{
mbScroll = (mnWinStyle & WB_SCROLL) ? sal_True : sal_False;
if ( (meAlign == WINDOWALIGN_TOP) || (meAlign == WINDOWALIGN_BOTTOM) )
- mbHorz = sal_True;
+ mbHorz = true;
else
- mbHorz = sal_False;
+ mbHorz = false;
// set focus back to document
ImplGetFrameWindow()->GetWindow( WINDOW_CLIENT )->GrabFocus();
@@ -4603,11 +4603,11 @@ void ToolBox::ToggleFloatingMode()
{
// if orientation changes, the toolbox has to be initialized again
// to update the direction of the gradient
- mbCalc = sal_True;
+ mbCalc = true;
ImplInitSettings( sal_True, sal_True, sal_True );
}
- mbFormat = sal_True;
+ mbFormat = true;
ImplFormat();
}
@@ -4873,7 +4873,7 @@ Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const
Size aSize = ImplCalcFloatSize( (ToolBox*) this, nCalcLines );
- pThis->mbFormat = sal_True;
+ pThis->mbFormat = true;
pThis->mpData->mbAssumeFloating = bFloat;
pThis->mpData->mbAssumeDocked = bDocking;
@@ -4988,9 +4988,9 @@ sal_Bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
if( pToolItem && pToolItem->mpWindow && HasFocus() )
{
ImplHideFocus();
- mbChangingHighlight = sal_True; // avoid focus change due to loose focus
+ mbChangingHighlight = true; // avoid focus change due to loose focus
pToolItem->mpWindow->ImplControlFocus( GETFOCUS_TAB );
- mbChangingHighlight = sal_False;
+ mbChangingHighlight = false;
}
else
{
@@ -5012,7 +5012,7 @@ sal_Bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
}
}
mnMouseModifier = aKeyCode.GetModifier();
- mbIsKeyEvent = sal_True;
+ mbIsKeyEvent = true;
Activate();
Click();
@@ -5025,7 +5025,7 @@ sal_Bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
ImplRemoveDel( &aDelData );
Deactivate();
- mbIsKeyEvent = sal_False;
+ mbIsKeyEvent = false;
mnMouseModifier = 0;
}
}
@@ -5084,15 +5084,15 @@ sal_Bool ToolBox::ImplOpenItem( KeyCode aKeyCode )
mnCurPos = GetItemPos( mnCurItemId );
mnLastFocusItemId = mnCurItemId; // save item id for possible later focus restore
mnMouseModifier = aKeyCode.GetModifier();
- mbIsShift = sal_True;
- mbIsKeyEvent = sal_True;
+ mbIsShift = true;
+ mbIsKeyEvent = true;
Activate();
mpData->mbDropDownByKeyboard = sal_True;
GetDropdownClickHdl().Call( this );
- mbIsKeyEvent = sal_False;
- mbIsShift = sal_False;
+ mbIsKeyEvent = false;
+ mbIsShift = false;
mnMouseModifier = 0;
}
else
@@ -5170,7 +5170,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
mnCurLine = mnCurLine - mnVisLines;
else
mnCurLine = 1;
- mbFormat = sal_True;
+ mbFormat = true;
ImplFormat();
ImplDrawSpin( sal_False, sal_False );
ImplChangeHighlight( ImplGetFirstValidItem( mnCurLine ) );
@@ -5183,7 +5183,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
mnCurLine = mnCurLine + mnVisLines;
else
mnCurLine = mnCurLines;
- mbFormat = sal_True;
+ mbFormat = true;
ImplFormat();
ImplDrawSpin( sal_False, sal_False );
ImplChangeHighlight( ImplGetFirstValidItem( mnCurLine ) );
@@ -5248,9 +5248,9 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
{
Window *pFocusWindow = Application::GetFocusWindow();
ImplHideFocus();
- mbChangingHighlight = sal_True; // avoid focus change due to loose focus
+ mbChangingHighlight = true; // avoid focus change due to loose focus
pItem->mpWindow->ImplControlFocus( GETFOCUS_TAB );
- mbChangingHighlight = sal_False;
+ mbChangingHighlight = false;
if( pFocusWindow != Application::GetFocusWindow() )
Application::GetFocusWindow()->KeyInput( rKEvt );
}
@@ -5369,7 +5369,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus )
if( mbChangingHighlight )
return;
- mbChangingHighlight = sal_True;
+ mbChangingHighlight = true;
ImplToolItem* pOldItem = NULL;
@@ -5403,12 +5403,12 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus )
if( nLine >= mnCurLine + mnVisLines )
{
mnCurLine = nLine - mnVisLines + 1;
- mbFormat = sal_True;
+ mbFormat = true;
}
else if ( nLine < mnCurLine )
{
mnCurLine = nLine;
- mbFormat = sal_True;
+ mbFormat = true;
}
if( mbFormat )
@@ -5436,7 +5436,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus )
mnCurPos = TOOLBOX_ITEM_NOTFOUND;
}
- mbChangingHighlight = sal_False;
+ mbChangingHighlight = false;
}
// -----------------------------------------------------------------------
@@ -5623,7 +5623,7 @@ void ToolBox::ImplShowFocus()
if( pItem->mpWindow )
{
Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow;
- pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = sal_True;
+ pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true;
pWin->Invalidate( 0 );
}
}
@@ -5639,7 +5639,7 @@ void ToolBox::ImplHideFocus()
if( pItem->mpWindow )
{
Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow;
- pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = sal_False;
+ pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = false;
pWin->Invalidate( 0 );
}
}
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index a9b8151d499a..6ffe5dc36930 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -390,11 +390,11 @@ void ToolBox::ImplInvalidate( sal_Bool bNewCalc, sal_Bool bFullPaint )
ImplUpdateInputEnable();
if ( bNewCalc )
- mbCalc = sal_True;
+ mbCalc = true;
if ( bFullPaint )
{
- mbFormat = sal_True;
+ mbFormat = true;
// Muss ueberhaupt eine neue Ausgabe erfolgen
if ( IsReallyVisible() && IsUpdateMode() )
@@ -408,7 +408,7 @@ void ToolBox::ImplInvalidate( sal_Bool bNewCalc, sal_Bool bFullPaint )
{
if ( !mbFormat )
{
- mbFormat = sal_True;
+ mbFormat = true;
// Muss ueberhaupt eine neue Ausgabe erfolgen
if ( IsReallyVisible() && IsUpdateMode() )
@@ -995,8 +995,8 @@ void ToolBox::SetToolboxButtonSize( ToolBoxButtonSize eSize )
if( mpData->meButtonSize != eSize )
{
mpData->meButtonSize = eSize;
- mbCalc = sal_True;
- mbFormat = sal_True;
+ mbCalc = true;
+ mbFormat = true;
}
}
@@ -1059,16 +1059,16 @@ void ToolBox::SetAlign( WindowAlign eNewAlign )
{
// Setzen, ob Items horizontal oder vertikal angeordnet werden sollen
if ( (eNewAlign == WINDOWALIGN_LEFT) || (eNewAlign == WINDOWALIGN_RIGHT) )
- mbHorz = sal_False;
+ mbHorz = false;
else
- mbHorz = sal_True;
+ mbHorz = true;
// Update the background according to Persona if necessary
ImplInitSettings( sal_False, sal_False, sal_True );
// Hier alles neu ausgeben, da sich Border auch aendert
- mbCalc = sal_True;
- mbFormat = sal_True;
+ mbCalc = true;
+ mbFormat = true;
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
}
@@ -1597,7 +1597,7 @@ void ToolBox::StartSelection()
if ( !mbSelection )
{
- mbSelection = sal_True;
+ mbSelection = true;
mnCurPos = TOOLBOX_ITEM_NOTFOUND;
mnCurItemId = 0;
Activate();
@@ -1608,13 +1608,13 @@ void ToolBox::StartSelection()
void ToolBox::EndSelection()
{
- mbCommandDrag = sal_False;
+ mbCommandDrag = false;
if ( mbDrag || mbSelection )
{
// Daten zuruecksetzen
- mbDrag = sal_False;
- mbSelection = sal_False;
+ mbDrag = false;
+ mbSelection = false;
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
ImplDrawItem( mnCurPos );
EndTracking();
@@ -1660,8 +1660,8 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, sal_Bool bDown, sal_Bool bRelease
{
if ( mbDrag || mbSelection )
{
- mbDrag = sal_False;
- mbSelection = sal_False;
+ mbDrag = false;
+ mbSelection = false;
EndTracking();
ReleaseMouse();
Deactivate();
@@ -2073,7 +2073,7 @@ void ToolBox::SetMenuType( sal_uInt16 aType )
if( pWrapper )
pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( aType & TOOLBOX_MENUTYPE_CUSTOMIZE) ? sal_True : sal_False );
- mbFormat = sal_True;
+ mbFormat = true;
ImplFormat();
ImplSetMinMaxFloatSize( this );
}
@@ -2307,8 +2307,8 @@ void ToolBox::Lock( sal_Bool bLock )
mpData->mbIsLocked = bLock;
if( !ImplIsFloatingMode() )
{
- mbCalc = sal_True;
- mbFormat = sal_True;
+ mbCalc = true;
+ mbFormat = true;
SetSizePixel( CalcWindowSizePixel(1) );
Invalidate();
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 60ae11ca509d..64e535ad6ff9 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -213,79 +213,79 @@ WindowImpl::WindowImpl( WindowType nType )
mnMarginRight = 0;
mnMarginTop = 0;
mnMarginBottom = 0;
- mbFrame = sal_False; // sal_True: Window is a frame window
- mbBorderWin = sal_False; // sal_True: Window is a border window
- mbOverlapWin = sal_False; // sal_True: Window is a overlap window
- mbSysWin = sal_False; // sal_True: SystemWindow is the base class
- mbDialog = sal_False; // sal_True: Dialog is the base class
- mbDockWin = sal_False; // sal_True: DockingWindow is the base class
- mbFloatWin = sal_False; // sal_True: FloatingWindow is the base class
- mbPushButton = sal_False; // sal_True: PushButton is the base class
- mbToolBox = sal_False; // sal_True: ToolBox is the base class
- mbMenuFloatingWindow= sal_False; // sal_True: MenuFloatingWindow is the base class
- mbToolbarFloatingWindow= sal_False; // sal_True: ImplPopupFloatWin is the base class, used for subtoolbars
- mbSplitter = sal_False; // sal_True: Splitter is the base class
- mbVisible = sal_False; // sal_True: Show( sal_True ) called
- mbOverlapVisible = sal_False; // sal_True: Hide called for visible window from ImplHideAllOverlapWindow()
- mbDisabled = sal_False; // sal_True: Enable( sal_False ) called
- mbInputDisabled = sal_False; // sal_True: EnableInput( sal_False ) called
- mbDropDisabled = sal_False; // sal_True: Drop is enabled
- mbNoUpdate = sal_False; // sal_True: SetUpdateMode( sal_False ) called
- mbNoParentUpdate = sal_False; // sal_True: SetParentUpdateMode( sal_False ) called
- mbActive = sal_False; // sal_True: Window Active
- mbParentActive = sal_False; // sal_True: OverlapActive from Parent
- mbReallyVisible = sal_False; // sal_True: this and all parents to an overlaped window are visible
- mbReallyShown = sal_False; // sal_True: this and all parents to an overlaped window are shown
- mbInInitShow = sal_False; // sal_True: we are in InitShow
- mbChildNotify = sal_False; // sal_True: ChildNotify
- mbChildPtrOverwrite = sal_False; // sal_True: PointerStyle overwrites Child-Pointer
- mbNoPtrVisible = sal_False; // sal_True: ShowPointer( sal_False ) called
- mbMouseMove = sal_False; // sal_True: BaseMouseMove called
- mbPaintFrame = sal_False; // sal_True: Paint is visible, but not painted
- mbInPaint = sal_False; // sal_True: Inside PaintHdl
- mbMouseButtonDown = sal_False; // sal_True: BaseMouseButtonDown called
- mbMouseButtonUp = sal_False; // sal_True: BaseMouseButtonUp called
- mbKeyInput = sal_False; // sal_True: BaseKeyInput called
- mbKeyUp = sal_False; // sal_True: BaseKeyUp called
- mbCommand = sal_False; // sal_True: BaseCommand called
- mbDefPos = sal_True; // sal_True: Position is not Set
- mbDefSize = sal_True; // sal_True: Size is not Set
- mbCallMove = sal_True; // sal_True: Move must be called by Show
- mbCallResize = sal_True; // sal_True: Resize must be called by Show
- mbWaitSystemResize = sal_True; // sal_True: Wait for System-Resize
- mbInitWinClipRegion = sal_True; // sal_True: Calc Window Clip Region
- mbInitChildRegion = sal_False; // sal_True: InitChildClipRegion
- mbWinRegion = sal_False; // sal_True: Window Region
- mbClipChildren = sal_False; // sal_True: Child-window should be clipped
- mbClipSiblings = sal_False; // sal_True: Adjacent Child-window should be clipped
- mbChildTransparent = sal_False; // sal_True: Child-windows are allowed to switch to transparent (incl. Parent-CLIPCHILDREN)
- mbPaintTransparent = sal_False; // sal_True: Paints should be executed on the Parent
- mbMouseTransparent = sal_False; // sal_True: Window is transparent for Mouse
- mbDlgCtrlStart = sal_False; // sal_True: From here on own Dialog-Control
- mbFocusVisible = sal_False; // sal_True: Focus Visible
- mbUseNativeFocus = sal_False;
- mbNativeFocusVisible= sal_False; // sal_True: native Focus Visible
- mbInShowFocus = sal_False; // prevent recursion
- mbInHideFocus = sal_False; // prevent recursion
- mbTrackVisible = sal_False; // sal_True: Tracking Visible
- mbControlForeground = sal_False; // sal_True: Foreground-Property set
- mbControlBackground = sal_False; // sal_True: Background-Property set
- mbAlwaysOnTop = sal_False; // sal_True: always visible for all others windows
- mbCompoundControl = sal_False; // sal_True: Composite Control => Listener...
- mbCompoundControlHasFocus = sal_False; // sal_True: Composite Control has focus somewhere
- mbPaintDisabled = sal_False; // sal_True: Paint should not be executed
- mbAllResize = sal_False; // sal_True: Also sent ResizeEvents with 0,0
- mbInDtor = sal_False; // sal_True: We're still in Window-Dtor
- mbExtTextInput = sal_False; // sal_True: ExtTextInput-Mode is active
- mbInFocusHdl = sal_False; // sal_True: Within GetFocus-Handler
- mbCreatedWithToolkit = sal_False;
- mbSuppressAccessibilityEvents = sal_False; // sal_True: do not send any accessibility events
- mbDrawSelectionBackground = sal_False; // sal_True: draws transparent window background to indicate (toolbox) selection
- mbIsInTaskPaneList = sal_False; // sal_True: window was added to the taskpanelist in the topmost system window
+ mbFrame = false; // sal_True: Window is a frame window
+ mbBorderWin = false; // sal_True: Window is a border window
+ mbOverlapWin = false; // sal_True: Window is a overlap window
+ mbSysWin = false; // sal_True: SystemWindow is the base class
+ mbDialog = false; // sal_True: Dialog is the base class
+ mbDockWin = false; // sal_True: DockingWindow is the base class
+ mbFloatWin = false; // sal_True: FloatingWindow is the base class
+ mbPushButton = false; // sal_True: PushButton is the base class
+ mbToolBox = false; // sal_True: ToolBox is the base class
+ mbMenuFloatingWindow= false; // sal_True: MenuFloatingWindow is the base class
+ mbToolbarFloatingWindow= false; // sal_True: ImplPopupFloatWin is the base class, used for subtoolbars
+ mbSplitter = false; // sal_True: Splitter is the base class
+ mbVisible = false; // sal_True: Show( sal_True ) called
+ mbOverlapVisible = false; // sal_True: Hide called for visible window from ImplHideAllOverlapWindow()
+ mbDisabled = false; // sal_True: Enable( sal_False ) called
+ mbInputDisabled = false; // sal_True: EnableInput( sal_False ) called
+ mbDropDisabled = false; // sal_True: Drop is enabled
+ mbNoUpdate = false; // sal_True: SetUpdateMode( sal_False ) called
+ mbNoParentUpdate = false; // sal_True: SetParentUpdateMode( sal_False ) called
+ mbActive = false; // sal_True: Window Active
+ mbParentActive = false; // sal_True: OverlapActive from Parent
+ mbReallyVisible = false; // sal_True: this and all parents to an overlaped window are visible
+ mbReallyShown = false; // sal_True: this and all parents to an overlaped window are shown
+ mbInInitShow = false; // sal_True: we are in InitShow
+ mbChildNotify = false; // sal_True: ChildNotify
+ mbChildPtrOverwrite = false; // sal_True: PointerStyle overwrites Child-Pointer
+ mbNoPtrVisible = false; // sal_True: ShowPointer( sal_False ) called
+ mbMouseMove = false; // sal_True: BaseMouseMove called
+ mbPaintFrame = false; // sal_True: Paint is visible, but not painted
+ mbInPaint = false; // sal_True: Inside PaintHdl
+ mbMouseButtonDown = false; // sal_True: BaseMouseButtonDown called
+ mbMouseButtonUp = false; // sal_True: BaseMouseButtonUp called
+ mbKeyInput = false; // sal_True: BaseKeyInput called
+ mbKeyUp = false; // sal_True: BaseKeyUp called
+ mbCommand = false; // sal_True: BaseCommand called
+ mbDefPos = true; // sal_True: Position is not Set
+ mbDefSize = true; // sal_True: Size is not Set
+ mbCallMove = true; // sal_True: Move must be called by Show
+ mbCallResize = true; // sal_True: Resize must be called by Show
+ mbWaitSystemResize = true; // sal_True: Wait for System-Resize
+ mbInitWinClipRegion = true; // sal_True: Calc Window Clip Region
+ mbInitChildRegion = false; // sal_True: InitChildClipRegion
+ mbWinRegion = false; // sal_True: Window Region
+ mbClipChildren = false; // sal_True: Child-window should be clipped
+ mbClipSiblings = false; // sal_True: Adjacent Child-window should be clipped
+ mbChildTransparent = false; // sal_True: Child-windows are allowed to switch to transparent (incl. Parent-CLIPCHILDREN)
+ mbPaintTransparent = false; // sal_True: Paints should be executed on the Parent
+ mbMouseTransparent = false; // sal_True: Window is transparent for Mouse
+ mbDlgCtrlStart = false; // sal_True: From here on own Dialog-Control
+ mbFocusVisible = false; // sal_True: Focus Visible
+ mbUseNativeFocus = false;
+ mbNativeFocusVisible= false; // sal_True: native Focus Visible
+ mbInShowFocus = false; // prevent recursion
+ mbInHideFocus = false; // prevent recursion
+ mbTrackVisible = false; // sal_True: Tracking Visible
+ mbControlForeground = false; // sal_True: Foreground-Property set
+ mbControlBackground = false; // sal_True: Background-Property set
+ mbAlwaysOnTop = false; // sal_True: always visible for all others windows
+ mbCompoundControl = false; // sal_True: Composite Control => Listener...
+ mbCompoundControlHasFocus = false; // sal_True: Composite Control has focus somewhere
+ mbPaintDisabled = false; // sal_True: Paint should not be executed
+ mbAllResize = false; // sal_True: Also sent ResizeEvents with 0,0
+ mbInDtor = false; // sal_True: We're still in Window-Dtor
+ mbExtTextInput = false; // sal_True: ExtTextInput-Mode is active
+ mbInFocusHdl = false; // sal_True: Within GetFocus-Handler
+ mbCreatedWithToolkit = false;
+ mbSuppressAccessibilityEvents = false; // sal_True: do not send any accessibility events
+ mbDrawSelectionBackground = false; // sal_True: draws transparent window background to indicate (toolbox) selection
+ mbIsInTaskPaneList = false; // sal_True: window was added to the taskpanelist in the topmost system window
mnNativeBackground = 0; // initialize later, depends on type
- mbCallHandlersDuringInputDisabled = sal_False; // sal_True: call event handlers even if input is disabled
- mbHelpTextDynamic = sal_False; // sal_True: append help id in HELP_DEBUG case
- mbFakeFocusSet = sal_False; // sal_True: pretend as if the window has focus.
+ mbCallHandlersDuringInputDisabled = false; // sal_True: call event handlers even if input is disabled
+ mbHelpTextDynamic = false; // sal_True: append help id in HELP_DEBUG case
+ mbFakeFocusSet = false; // sal_True: pretend as if the window has focus.
mbHexpand = false;
mbVexpand = false;
mbExpand = false;
@@ -760,8 +760,8 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
}
else if( !mpWindowImpl->mbFrame && ! pParent )
{
- mpWindowImpl->mbOverlapWin = sal_True;
- mpWindowImpl->mbFrame = sal_True;
+ mpWindowImpl->mbOverlapWin = true;
+ mpWindowImpl->mbFrame = true;
}
// insert window in list
@@ -1042,7 +1042,7 @@ void Window::ImplInsertWindow( Window* pParent )
mpWindowImpl->mpFrameData = pFrameParent->mpWindowImpl->mpFrameData;
mpWindowImpl->mpFrame = pFrameParent->mpWindowImpl->mpFrame;
mpWindowImpl->mpFrameWindow = pFrameParent;
- mpWindowImpl->mbFrame = sal_False;
+ mpWindowImpl->mbFrame = false;
// search overlap window and insert window in list
if ( ImplIsOverlapWindow() )
@@ -1166,7 +1166,7 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition)
void Window::ImplCallResize()
{
- mpWindowImpl->mbCallResize = sal_False;
+ mpWindowImpl->mbCallResize = false;
if( GetBackground().IsGradient() )
Invalidate();
@@ -1182,7 +1182,7 @@ void Window::ImplCallResize()
void Window::ImplCallMove()
{
- mpWindowImpl->mbCallMove = sal_False;
+ mpWindowImpl->mbCallMove = false;
if( mpWindowImpl->mbFrame )
{
@@ -1333,14 +1333,14 @@ void Window::ImplLoadRes( const ResId& rResId )
SetSizePixel( aSize );
if ( nRSStyle & RSWND_DISABLED )
- Enable( sal_False );
+ Enable( false );
if ( nObjMask & WINDOW_TEXT )
SetText( ReadStringRes() );
if ( nObjMask & WINDOW_HELPTEXT )
{
SetHelpText( ReadStringRes() );
- mpWindowImpl->mbHelpTextDynamic = sal_True;
+ mpWindowImpl->mbHelpTextDynamic = true;
}
if ( nObjMask & WINDOW_QUICKTEXT )
SetQuickHelpText( ReadStringRes() );
@@ -1390,7 +1390,7 @@ ImplWinData* Window::ImplGetWinData() const
SalGraphics* Window::ImplGetFrameGraphics() const
{
if ( mpWindowImpl->mpFrameWindow->mpGraphics )
- mpWindowImpl->mpFrameWindow->mbInitClipRegion = sal_True;
+ mpWindowImpl->mpFrameWindow->mbInitClipRegion = true;
else
mpWindowImpl->mpFrameWindow->ImplGetGraphics();
mpWindowImpl->mpFrameWindow->mpGraphics->ResetClipRegion();
@@ -1577,9 +1577,9 @@ void Window::ImplResetReallyVisible()
{
sal_Bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible;
- mbDevOutput = sal_False;
- mpWindowImpl->mbReallyVisible = sal_False;
- mpWindowImpl->mbReallyShown = sal_False;
+ mbDevOutput = false;
+ mpWindowImpl->mbReallyVisible = false;
+ mpWindowImpl->mbReallyShown = false;
// the SHOW/HIDE events serve as indicators to send child creation/destroy events to the access bridge.
// For this, the data member of the event must not be NULL.
@@ -1618,9 +1618,9 @@ void Window::ImplSetReallyVisible()
sal_Bool bBecameReallyVisible = !mpWindowImpl->mbReallyVisible;
- mbDevOutput = sal_True;
- mpWindowImpl->mbReallyVisible = sal_True;
- mpWindowImpl->mbReallyShown = sal_True;
+ mbDevOutput = true;
+ mpWindowImpl->mbReallyVisible = true;
+ mpWindowImpl->mbReallyShown = true;
// the SHOW/HIDE events serve as indicators to send child creation/destroy events to the access bridge.
// For this, the data member of the event must not be NULL.
@@ -1652,10 +1652,10 @@ void Window::ImplSetReallyVisible()
void Window::ImplCallInitShow()
{
- mpWindowImpl->mbReallyShown = sal_True;
- mpWindowImpl->mbInInitShow = sal_True;
+ mpWindowImpl->mbReallyShown = true;
+ mpWindowImpl->mbInInitShow = true;
StateChanged( STATE_CHANGE_INITSHOW );
- mpWindowImpl->mbInInitShow = sal_False;
+ mpWindowImpl->mbInInitShow = false;
Window* pWindow = mpWindowImpl->mpFirstOverlap;
while ( pWindow )
@@ -1870,7 +1870,7 @@ sal_Bool Window::ImplSysObjClip( const Region* pOldRegion )
}
}
else
- bVisibleState = sal_False;
+ bVisibleState = false;
}
// Visible-Status updaten
@@ -1943,8 +1943,8 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller )
if ( bSysObjOnlySmaller && !mpWindowImpl->mbInitWinClipRegion )
pOldRegion = new Region( mpWindowImpl->maWinClipRegion );
- mbInitClipRegion = sal_True;
- mpWindowImpl->mbInitWinClipRegion = sal_True;
+ mbInitClipRegion = true;
+ mpWindowImpl->mbInitWinClipRegion = true;
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
@@ -1956,8 +1956,8 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller )
if ( !ImplSysObjClip( pOldRegion ) )
{
- mbInitClipRegion = sal_True;
- mpWindowImpl->mbInitWinClipRegion = sal_True;
+ mbInitClipRegion = true;
+ mpWindowImpl->mbInitWinClipRegion = true;
bUpdate = sal_False;
}
@@ -1965,8 +1965,8 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller )
}
else
{
- mbInitClipRegion = sal_True;
- mpWindowImpl->mbInitWinClipRegion = sal_True;
+ mbInitClipRegion = true;
+ mpWindowImpl->mbInitWinClipRegion = true;
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
@@ -2008,8 +2008,8 @@ sal_Bool Window::ImplSetClipFlag( sal_Bool bSysObjOnlySmaller )
if ( pParent &&
((pParent->GetStyle() & WB_CLIPCHILDREN) || (mpWindowImpl->mnParentClipMode & PARENTCLIPMODE_CLIP)) )
{
- pParent->mbInitClipRegion = sal_True;
- pParent->mpWindowImpl->mbInitChildRegion = sal_True;
+ pParent->mbInitClipRegion = true;
+ pParent->mpWindowImpl->mbInitChildRegion = true;
}
// siblings should recalculate their clip region
@@ -2206,9 +2206,9 @@ void Window::ImplInitWinClipRegion()
// Clip Children
if ( (GetStyle() & WB_CLIPCHILDREN) || mpWindowImpl->mbClipChildren )
- mpWindowImpl->mbInitChildRegion = sal_True;
+ mpWindowImpl->mbInitChildRegion = true;
- mpWindowImpl->mbInitWinClipRegion = sal_False;
+ mpWindowImpl->mbInitWinClipRegion = false;
}
// -----------------------------------------------------------------------
@@ -2233,7 +2233,7 @@ void Window::ImplInitWinChildClipRegion()
ImplClipChildren( *mpWindowImpl->mpChildClipRegion );
}
- mpWindowImpl->mbInitChildRegion = sal_False;
+ mpWindowImpl->mbInitChildRegion = false;
}
// -----------------------------------------------------------------------
@@ -2394,7 +2394,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
// other parameters used below.
PrePaint();
- mpWindowImpl->mbPaintFrame = sal_False;
+ mpWindowImpl->mbPaintFrame = false;
if ( nPaintFlags & IMPL_PAINT_PAINTALLCHILDREN )
mpWindowImpl->mnPaintFlags |= IMPL_PAINT_PAINT | IMPL_PAINT_PAINTALLCHILDREN | (nPaintFlags & IMPL_PAINT_PAINTALL);
@@ -2449,8 +2449,8 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
if ( mpWindowImpl->mpCursor )
bRestoreCursor = mpWindowImpl->mpCursor->ImplSuspend();
- mbInitClipRegion = sal_True;
- mpWindowImpl->mbInPaint = sal_True;
+ mbInitClipRegion = true;
+ mpWindowImpl->mbInPaint = true;
// restore Paint-Region
Region aPaintRegion( mpWindowImpl->maInvalidateRegion );
@@ -2502,8 +2502,8 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
if ( mpWindowImpl->mbFocusVisible )
ImplInvertFocus( *(mpWindowImpl->mpWinData->mpFocusRect) );
}
- mpWindowImpl->mbInPaint = sal_False;
- mbInitClipRegion = sal_True;
+ mpWindowImpl->mbInPaint = false;
+ mbInitClipRegion = true;
mpWindowImpl->mpPaintRegion = NULL;
if ( mpWindowImpl->mpCursor )
mpWindowImpl->mpCursor->ImplResume( bRestoreCursor );
@@ -3415,7 +3415,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
}
else
{
- mpWindowImpl->mpClientWindow->mpWindowImpl->mbCallMove = sal_True;
+ mpWindowImpl->mpClientWindow->mpWindowImpl->mbCallMove = true;
}
}
}
@@ -3436,9 +3436,9 @@ void Window::ImplPosSizeWindow( long nX, long nY,
else
{
if ( bNewPos )
- mpWindowImpl->mbCallMove = sal_True;
+ mpWindowImpl->mbCallMove = true;
if ( bNewSize )
- mpWindowImpl->mbCallResize = sal_True;
+ mpWindowImpl->mbCallResize = true;
}
sal_Bool bUpdateSysObjClip = sal_False;
@@ -3788,7 +3788,7 @@ void Window::ImplShowAllOverlaps()
if ( pOverlapWindow->mpWindowImpl->mbOverlapVisible )
{
pOverlapWindow->Show( true, SHOW_NOACTIVATE );
- pOverlapWindow->mpWindowImpl->mbOverlapVisible = sal_False;
+ pOverlapWindow->mpWindowImpl->mbOverlapVisible = false;
}
pOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext;
@@ -3804,7 +3804,7 @@ void Window::ImplHideAllOverlaps()
{
if ( pOverlapWindow->IsVisible() )
{
- pOverlapWindow->mpWindowImpl->mbOverlapVisible = sal_True;
+ pOverlapWindow->mpWindowImpl->mbOverlapVisible = true;
pOverlapWindow->Show( false );
}
@@ -3902,11 +3902,11 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
else
{
Window* pLastRealWindow = pSVData->maWinData.mpLastDeacWin->ImplGetWindow();
- pSVData->maWinData.mpLastDeacWin->mpWindowImpl->mbActive = sal_False;
+ pSVData->maWinData.mpLastDeacWin->mpWindowImpl->mbActive = false;
pSVData->maWinData.mpLastDeacWin->Deactivate();
if ( pLastRealWindow != pSVData->maWinData.mpLastDeacWin )
{
- pLastRealWindow->mpWindowImpl->mbActive = sal_True;
+ pLastRealWindow->mpWindowImpl->mbActive = true;
pLastRealWindow->Activate();
}
}
@@ -3918,14 +3918,14 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
{
if( pOldOverlapWindow->mpWindowImpl->mbActive )
{
- pOldOverlapWindow->mpWindowImpl->mbActive = sal_False;
+ pOldOverlapWindow->mpWindowImpl->mbActive = false;
pOldOverlapWindow->Deactivate();
}
if ( pOldRealWindow != pOldOverlapWindow )
{
if( pOldRealWindow->mpWindowImpl->mbActive )
{
- pOldRealWindow->mpWindowImpl->mbActive = sal_False;
+ pOldRealWindow->mpWindowImpl->mbActive = false;
pOldRealWindow->Deactivate();
}
}
@@ -3934,14 +3934,14 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
{
if( ! pNewOverlapWindow->mpWindowImpl->mbActive )
{
- pNewOverlapWindow->mpWindowImpl->mbActive = sal_True;
+ pNewOverlapWindow->mpWindowImpl->mbActive = true;
pNewOverlapWindow->Activate();
}
if ( pNewRealWindow != pNewOverlapWindow )
{
if( ! pNewRealWindow->mpWindowImpl->mbActive )
{
- pNewRealWindow->mpWindowImpl->mbActive = sal_True;
+ pNewRealWindow->mpWindowImpl->mbActive = true;
pNewRealWindow->Activate();
}
}
@@ -4106,11 +4106,11 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
{
Window* pNewOverlapWindow = ImplGetFirstOverlapWindow();
Window* pNewRealWindow = pNewOverlapWindow->ImplGetWindow();
- pNewOverlapWindow->mpWindowImpl->mbActive = sal_True;
+ pNewOverlapWindow->mpWindowImpl->mbActive = true;
pNewOverlapWindow->Activate();
if ( pNewRealWindow != pNewOverlapWindow )
{
- pNewRealWindow->mpWindowImpl->mbActive = sal_True;
+ pNewRealWindow->mpWindowImpl->mbActive = true;
pNewRealWindow->Activate();
}
}
@@ -4140,7 +4140,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
{
if ( mpWindowImpl->mpCursor )
mpWindowImpl->mpCursor->ImplShow();
- mpWindowImpl->mbInFocusHdl = sal_True;
+ mpWindowImpl->mbInFocusHdl = true;
mpWindowImpl->mnGetFocusFlags = nFlags;
// if we're changing focus due to closing a popup floating window
// notify the new focus window so it can restore the inner focus
@@ -4157,7 +4157,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
if( !aDogTag.IsDead() )
{
mpWindowImpl->mnGetFocusFlags = 0;
- mpWindowImpl->mbInFocusHdl = sal_False;
+ mpWindowImpl->mbInFocusHdl = false;
}
}
}
@@ -4290,7 +4290,7 @@ Window::~Window()
xCanvasComponent->dispose();
}
- mpWindowImpl->mbInDtor = sal_True;
+ mpWindowImpl->mbInDtor = true;
ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
@@ -4388,7 +4388,7 @@ Window::~Window()
pSVData->maWinData.mpDefDialogParent = NULL;
#if OSL_DEBUG_LEVEL > 0
- if ( sal_True ) // always perform these tests in non-pro versions
+ if ( true ) // always perform these tests in non-pro versions
{
OStringBuffer aErrorStr;
sal_Bool bError = sal_False;
@@ -4737,7 +4737,7 @@ void Window::MouseMove( const MouseEvent& rMEvt )
{
NotifyEvent aNEvt( EVENT_MOUSEMOVE, this, &rMEvt );
if ( !Notify( aNEvt ) )
- mpWindowImpl->mbMouseMove = sal_True;
+ mpWindowImpl->mbMouseMove = true;
}
// -----------------------------------------------------------------------
@@ -4746,7 +4746,7 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt )
{
NotifyEvent aNEvt( EVENT_MOUSEBUTTONDOWN, this, &rMEvt );
if ( !Notify( aNEvt ) )
- mpWindowImpl->mbMouseButtonDown = sal_True;
+ mpWindowImpl->mbMouseButtonDown = true;
}
// -----------------------------------------------------------------------
@@ -4755,7 +4755,7 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt )
{
NotifyEvent aNEvt( EVENT_MOUSEBUTTONUP, this, &rMEvt );
if ( !Notify( aNEvt ) )
- mpWindowImpl->mbMouseButtonUp = sal_True;
+ mpWindowImpl->mbMouseButtonUp = true;
}
// -----------------------------------------------------------------------
@@ -4764,7 +4764,7 @@ void Window::KeyInput( const KeyEvent& rKEvt )
{
NotifyEvent aNEvt( EVENT_KEYINPUT, this, &rKEvt );
if ( !Notify( aNEvt ) )
- mpWindowImpl->mbKeyInput = sal_True;
+ mpWindowImpl->mbKeyInput = true;
}
// -----------------------------------------------------------------------
@@ -4773,7 +4773,7 @@ void Window::KeyUp( const KeyEvent& rKEvt )
{
NotifyEvent aNEvt( EVENT_KEYUP, this, &rKEvt );
if ( !Notify( aNEvt ) )
- mpWindowImpl->mbKeyUp = sal_True;
+ mpWindowImpl->mbKeyUp = true;
}
// -----------------------------------------------------------------------
@@ -4891,7 +4891,7 @@ void Window::Command( const CommandEvent& rCEvt )
NotifyEvent aNEvt( EVENT_COMMAND, this, &rCEvt );
if ( !Notify( aNEvt ) )
- mpWindowImpl->mbCommand = sal_True;
+ mpWindowImpl->mbCommand = true;
}
// -----------------------------------------------------------------------
@@ -5057,7 +5057,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
sal_Bool bCompoundFocusChanged = sal_False;
if ( mpWindowImpl->mbCompoundControl && !mpWindowImpl->mbCompoundControlHasFocus && HasChildPathFocus() )
{
- mpWindowImpl->mbCompoundControlHasFocus = sal_True;
+ mpWindowImpl->mbCompoundControlHasFocus = true;
bCompoundFocusChanged = sal_True;
}
@@ -5069,7 +5069,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
sal_Bool bCompoundFocusChanged = sal_False;
if ( mpWindowImpl->mbCompoundControl && mpWindowImpl->mbCompoundControlHasFocus && !HasChildPathFocus() )
{
- mpWindowImpl->mbCompoundControlHasFocus = sal_False ;
+ mpWindowImpl->mbCompoundControlHasFocus = false ;
bCompoundFocusChanged = sal_True;
}
@@ -5771,7 +5771,7 @@ void Window::SetParentClipMode( sal_uInt16 nMode )
{
mpWindowImpl->mnParentClipMode = nMode;
if ( nMode & PARENTCLIPMODE_CLIP )
- mpWindowImpl->mpParent->mpWindowImpl->mbClipChildren = sal_True;
+ mpWindowImpl->mpParent->mpWindowImpl->mbClipChildren = true;
}
}
}
@@ -5797,7 +5797,7 @@ void Window::SetWindowRegionPixel()
else if( mpWindowImpl->mbFrame )
{
mpWindowImpl->maWinRegion = Region(true);
- mpWindowImpl->mbWinRegion = sal_False;
+ mpWindowImpl->mbWinRegion = false;
mpWindowImpl->mpFrame->ResetClipRegion();
}
else
@@ -5805,7 +5805,7 @@ void Window::SetWindowRegionPixel()
if ( mpWindowImpl->mbWinRegion )
{
mpWindowImpl->maWinRegion = Region(true);
- mpWindowImpl->mbWinRegion = sal_False;
+ mpWindowImpl->mbWinRegion = false;
ImplSetClipFlag();
if ( IsReallyVisible() )
@@ -5886,14 +5886,14 @@ void Window::SetWindowRegionPixel( const Region& rRegion )
if ( mpWindowImpl->mbWinRegion )
{
mpWindowImpl->maWinRegion = Region(true);
- mpWindowImpl->mbWinRegion = sal_False;
+ mpWindowImpl->mbWinRegion = false;
ImplSetClipFlag();
}
}
else
{
mpWindowImpl->maWinRegion = rRegion;
- mpWindowImpl->mbWinRegion = sal_True;
+ mpWindowImpl->mbWinRegion = true;
ImplSetClipFlag();
}
@@ -6004,7 +6004,7 @@ void Window::ExpandPaintClipRegion( const Region& rRegion )
if( ! aDevPixRegion.IsEmpty() )
{
mpWindowImpl->mpPaintRegion->Union( aDevPixRegion );
- mbInitClipRegion = sal_True;
+ mbInitClipRegion = true;
}
}
}
@@ -6115,7 +6115,7 @@ void Window::SetParent( Window* pNewParent )
ImplRemoveWindow( bNewFrame );
ImplInsertWindow( pNewParent );
if ( mpWindowImpl->mnParentClipMode & PARENTCLIPMODE_CLIP )
- pNewParent->mpWindowImpl->mbClipChildren = sal_True;
+ pNewParent->mpWindowImpl->mbClipChildren = true;
ImplUpdateWindowPtr();
if ( ImplUpdatePos() )
ImplUpdateSysObjPos();
@@ -6216,13 +6216,13 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
{
bool bOldUpdate = mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate;
if ( mpWindowImpl->mbNoParentUpdate )
- mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = sal_True;
+ mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = true;
mpWindowImpl->mpBorderWindow->Show( false, nFlags );
mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = bOldUpdate;
}
else if ( mpWindowImpl->mbFrame )
{
- mpWindowImpl->mbSuppressAccessibilityEvents = sal_True;
+ mpWindowImpl->mbSuppressAccessibilityEvents = true;
mpWindowImpl->mpFrame->Show( sal_False, sal_False );
}
@@ -6372,9 +6372,9 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
}
//DBG_ASSERT( !mpWindowImpl->mbSuppressAccessibilityEvents, "Window::Show() - Frame reactivated");
- mpWindowImpl->mbSuppressAccessibilityEvents = sal_False;
+ mpWindowImpl->mbSuppressAccessibilityEvents = false;
- mpWindowImpl->mbPaintFrame = sal_True;
+ mpWindowImpl->mbPaintFrame = true;
sal_Bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? sal_True : sal_False;
mpWindowImpl->mpFrame->Show( sal_True, bNoActivate );
if( aDogTag.IsDead() )
@@ -6502,10 +6502,10 @@ void Window::Enable( bool bEnable, bool bChild )
if ( mpWindowImpl->mpBorderWindow )
{
- mpWindowImpl->mpBorderWindow->Enable( bEnable, sal_False );
+ mpWindowImpl->mpBorderWindow->Enable( bEnable, false );
if ( (mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) &&
((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow )
- ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->Enable( bEnable, sal_True );
+ ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->Enable( bEnable, true );
}
// #i56102# restore app focus win in case the
@@ -6706,7 +6706,7 @@ void Window::AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild )
mpWindowImpl->meAlwaysInputMode = AlwaysInputEnabled;
if ( bAlways )
- EnableInput( sal_True, sal_False );
+ EnableInput( true, sal_False );
}
else if( ! bAlways && mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled )
{
@@ -6737,7 +6737,7 @@ void Window::AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild )
mpWindowImpl->meAlwaysInputMode = AlwaysInputDisabled;
if ( bAlways )
- EnableInput( sal_False, sal_False );
+ EnableInput( false, sal_False );
}
else if( ! bAlways && mpWindowImpl->meAlwaysInputMode == AlwaysInputDisabled )
{
@@ -6773,7 +6773,7 @@ void Window::SetActivateMode( sal_uInt16 nMode )
if ( (mpWindowImpl->mbActive || (GetType() == WINDOW_BORDERWINDOW)) &&
!HasChildPathFocus( sal_True ) )
{
- mpWindowImpl->mbActive = sal_False;
+ mpWindowImpl->mbActive = false;
Deactivate();
}
}
@@ -6781,7 +6781,7 @@ void Window::SetActivateMode( sal_uInt16 nMode )
{
if ( !mpWindowImpl->mbActive || (GetType() == WINDOW_BORDERWINDOW) )
{
- mpWindowImpl->mbActive = sal_True;
+ mpWindowImpl->mbActive = true;
Activate();
}
}
@@ -6997,9 +6997,9 @@ void Window::setPosSizePixel( long nX, long nY,
bool bHasValidSize = !mpWindowImpl->mbDefSize;
if ( nFlags & WINDOW_POSSIZE_POS )
- mpWindowImpl->mbDefPos = sal_False;
+ mpWindowImpl->mbDefPos = false;
if ( nFlags & WINDOW_POSSIZE_SIZE )
- mpWindowImpl->mbDefSize = sal_False;
+ mpWindowImpl->mbDefSize = false;
// The top BorderWindow is the window which is to be positioned
Window* pWindow = this;
@@ -7856,7 +7856,7 @@ const OUString& Window::GetHelpText() const
if ( pHelp )
{
((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this );
- mpWindowImpl->mbHelpTextDynamic = sal_False;
+ mpWindowImpl->mbHelpTextDynamic = false;
}
}
}
@@ -7871,7 +7871,7 @@ const OUString& Window::GetHelpText() const
aTxt.append( OUString( aStrHelpId ) );
mpWindowImpl->maHelpText = aTxt.makeStringAndClear();
}
- mpWindowImpl->mbHelpTextDynamic = sal_False;
+ mpWindowImpl->mbHelpTextDynamic = false;
}
return mpWindowImpl->maHelpText;
@@ -9460,7 +9460,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
sal_Bool bRVisible = mpWindowImpl->mbReallyVisible;
mpWindowImpl->mbReallyVisible = mpWindowImpl->mbVisible;
sal_Bool bDevOutput = mbDevOutput;
- mbDevOutput = sal_True;
+ mbDevOutput = true;
long nOldDPIX = ImplGetDPIX();
long nOldDPIY = ImplGetDPIY();
@@ -9597,7 +9597,7 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /
}
sal_Bool bVisible = mpWindowImpl->mbVisible;
- mpWindowImpl->mbVisible = sal_True;
+ mpWindowImpl->mbVisible = true;
if( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->ImplPaintToDevice( pDev, rPos );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 56251d8a8c44..37aaa8261225 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -295,7 +295,7 @@ void Window::ShowFocus( const Rectangle& rRect )
{
if( mpWindowImpl->mbInShowFocus )
return;
- mpWindowImpl->mbInShowFocus = sal_True;
+ mpWindowImpl->mbInShowFocus = true;
ImplWinData* pWinData = ImplGetWinData();
@@ -309,7 +309,7 @@ void Window::ShowFocus( const Rectangle& rRect )
{
if ( *(pWinData->mpFocusRect) == rRect )
{
- mpWindowImpl->mbInShowFocus = sal_False;
+ mpWindowImpl->mbInShowFocus = false;
return;
}
@@ -322,18 +322,18 @@ void Window::ShowFocus( const Rectangle& rRect )
pWinData->mpFocusRect = new Rectangle( rRect );
else
*(pWinData->mpFocusRect) = rRect;
- mpWindowImpl->mbFocusVisible = sal_True;
+ mpWindowImpl->mbFocusVisible = true;
}
else
{
if( ! mpWindowImpl->mbNativeFocusVisible )
{
- mpWindowImpl->mbNativeFocusVisible = sal_True;
+ mpWindowImpl->mbNativeFocusVisible = true;
if ( !mpWindowImpl->mbInPaint )
Invalidate();
}
}
- mpWindowImpl->mbInShowFocus = sal_False;
+ mpWindowImpl->mbInShowFocus = false;
}
// -----------------------------------------------------------------------
@@ -343,7 +343,7 @@ void Window::HideFocus()
if( mpWindowImpl->mbInHideFocus )
return;
- mpWindowImpl->mbInHideFocus = sal_True;
+ mpWindowImpl->mbInHideFocus = true;
// native themeing can suggest not to use focus rects
if( ! ( mpWindowImpl->mbUseNativeFocus &&
@@ -351,24 +351,24 @@ void Window::HideFocus()
{
if ( !mpWindowImpl->mbFocusVisible )
{
- mpWindowImpl->mbInHideFocus = sal_False;
+ mpWindowImpl->mbInHideFocus = false;
return;
}
if ( !mpWindowImpl->mbInPaint )
ImplInvertFocus( *(ImplGetWinData()->mpFocusRect) );
- mpWindowImpl->mbFocusVisible = sal_False;
+ mpWindowImpl->mbFocusVisible = false;
}
else
{
if( mpWindowImpl->mbNativeFocusVisible )
{
- mpWindowImpl->mbNativeFocusVisible = sal_False;
+ mpWindowImpl->mbNativeFocusVisible = false;
if ( !mpWindowImpl->mbInPaint )
Invalidate();
}
}
- mpWindowImpl->mbInHideFocus = sal_False;
+ mpWindowImpl->mbInHideFocus = false;
}
// -----------------------------------------------------------------------
@@ -466,7 +466,7 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
else
*(pWinData->mpTrackRect) = rRect;
pWinData->mnTrackFlags = nFlags;
- mpWindowImpl->mbTrackVisible = sal_True;
+ mpWindowImpl->mbTrackVisible = true;
}
// -----------------------------------------------------------------------
@@ -478,7 +478,7 @@ void Window::HideTracking()
ImplWinData* pWinData = ImplGetWinData();
if ( !mpWindowImpl->mbInPaint || !(pWinData->mnTrackFlags & SHOWTRACK_WINDOW) )
InvertTracking( *(pWinData->mpTrackRect), pWinData->mnTrackFlags );
- mpWindowImpl->mbTrackVisible = sal_False;
+ mpWindowImpl->mbTrackVisible = false;
}
}
@@ -934,7 +934,7 @@ void Window::SetControlForeground()
if ( mpWindowImpl->mbControlForeground )
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
- mpWindowImpl->mbControlForeground = sal_False;
+ mpWindowImpl->mbControlForeground = false;
StateChanged( STATE_CHANGE_CONTROLFOREGROUND );
}
}
@@ -948,7 +948,7 @@ void Window::SetControlForeground( const Color& rColor )
if ( mpWindowImpl->mbControlForeground )
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
- mpWindowImpl->mbControlForeground = sal_False;
+ mpWindowImpl->mbControlForeground = false;
StateChanged( STATE_CHANGE_CONTROLFOREGROUND );
}
}
@@ -957,7 +957,7 @@ void Window::SetControlForeground( const Color& rColor )
if ( mpWindowImpl->maControlForeground != rColor )
{
mpWindowImpl->maControlForeground = rColor;
- mpWindowImpl->mbControlForeground = sal_True;
+ mpWindowImpl->mbControlForeground = true;
StateChanged( STATE_CHANGE_CONTROLFOREGROUND );
}
}
@@ -970,7 +970,7 @@ void Window::SetControlBackground()
if ( mpWindowImpl->mbControlBackground )
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
- mpWindowImpl->mbControlBackground = sal_False;
+ mpWindowImpl->mbControlBackground = false;
StateChanged( STATE_CHANGE_CONTROLBACKGROUND );
}
}
@@ -984,7 +984,7 @@ void Window::SetControlBackground( const Color& rColor )
if ( mpWindowImpl->mbControlBackground )
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
- mpWindowImpl->mbControlBackground = sal_False;
+ mpWindowImpl->mbControlBackground = false;
StateChanged( STATE_CHANGE_CONTROLBACKGROUND );
}
}
@@ -993,7 +993,7 @@ void Window::SetControlBackground( const Color& rColor )
if ( mpWindowImpl->maControlBackground != rColor )
{
mpWindowImpl->maControlBackground = rColor;
- mpWindowImpl->mbControlBackground = sal_True;
+ mpWindowImpl->mbControlBackground = true;
StateChanged( STATE_CHANGE_CONTROLBACKGROUND );
}
}
@@ -1645,7 +1645,7 @@ sal_Bool Window::IsZoom() const
void Window::SetHelpText( const OUString& rHelpText )
{
mpWindowImpl->maHelpText = rHelpText;
- mpWindowImpl->mbHelpTextDynamic = sal_True;
+ mpWindowImpl->mbHelpTextDynamic = true;
}
void Window::SetQuickHelpText( const OUString& rHelpText )
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index fecf3bc3ebcb..0d5de81a444e 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -239,7 +239,7 @@ static sal_Bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData =
return sal_False;
if ( !bPreNotify )
{
- pChild->ImplGetWindowImpl()->mbCommand = sal_False;
+ pChild->ImplGetWindowImpl()->mbCommand = false;
pChild->Command( aCEvt );
if( aDelData.IsDead() )
@@ -718,7 +718,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
// if the MouseMove handler changes the help window's visibility
// the HelpRequest handler should not be called anymore
Window* pOldHelpTextWin = pSVData->maHelpData.mpHelpWin;
- pChild->ImplGetWindowImpl()->mbMouseMove = sal_False;
+ pChild->ImplGetWindowImpl()->mbMouseMove = false;
pChild->MouseMove( aMEvt );
if ( pOldHelpTextWin != pSVData->maHelpData.mpHelpWin )
bCallHelpRequest = sal_False;
@@ -732,7 +732,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
nRet = true;
else
{
- pChild->ImplGetWindowImpl()->mbMouseButtonDown = sal_False;
+ pChild->ImplGetWindowImpl()->mbMouseButtonDown = false;
pChild->MouseButtonDown( aMEvt );
}
}
@@ -745,7 +745,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
}
else
{
- pChild->ImplGetWindowImpl()->mbMouseButtonUp = sal_False;
+ pChild->ImplGetWindowImpl()->mbMouseButtonUp = false;
pChild->MouseButtonUp( aMEvt );
}
}
@@ -1041,12 +1041,12 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
{
if ( nSVEvent == EVENT_KEYINPUT )
{
- pChild->ImplGetWindowImpl()->mbKeyInput = sal_False;
+ pChild->ImplGetWindowImpl()->mbKeyInput = false;
pChild->KeyInput( aKeyEvt );
}
else
{
- pChild->ImplGetWindowImpl()->mbKeyUp = sal_False;
+ pChild->ImplGetWindowImpl()->mbKeyUp = false;
pChild->KeyUp( aKeyEvt );
}
// #82968#
@@ -1155,12 +1155,12 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
{
if ( nSVEvent == EVENT_KEYINPUT )
{
- pChild->ImplGetWindowImpl()->mbKeyInput = sal_False;
+ pChild->ImplGetWindowImpl()->mbKeyInput = false;
pChild->KeyInput( aKEvt );
}
else
{
- pChild->ImplGetWindowImpl()->mbKeyUp = sal_False;
+ pChild->ImplGetWindowImpl()->mbKeyUp = false;
pChild->KeyUp( aKEvt );
}
// #82968#
@@ -1207,7 +1207,7 @@ static bool ImplHandleExtTextInput( Window* pWindow,
ImplWinData* pWinData = pChild->ImplGetWinData();
if ( !pChild->ImplGetWindowImpl()->mbExtTextInput )
{
- pChild->ImplGetWindowImpl()->mbExtTextInput = sal_True;
+ pChild->ImplGetWindowImpl()->mbExtTextInput = true;
pWinData->mpExtOldText = new OUString;
if ( pWinData->mpExtOldAttrAry )
{
@@ -1282,7 +1282,7 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ )
if ( pChild )
{
- pChild->ImplGetWindowImpl()->mbExtTextInput = sal_False;
+ pChild->ImplGetWindowImpl()->mbExtTextInput = false;
pSVData->maWinData.mpExtTextInputWin = NULL;
ImplWinData* pWinData = pChild->ImplGetWinData();
if ( pWinData->mpExtOldText )
@@ -1363,7 +1363,7 @@ static sal_Bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
const CommandWheelData* pWheelData )
{
Point aCmdMousePos = pWindow->ImplFrameToOutput( rPos );
- CommandEvent aCEvt( aCmdMousePos, COMMAND_WHEEL, sal_True, pWheelData );
+ CommandEvent aCEvt( aCmdMousePos, COMMAND_WHEEL, true, pWheelData );
NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
ImplDelData aDelData( pWindow );
bool bPreNotify = ImplCallPreNotify( aNCmdEvt );
@@ -1371,7 +1371,7 @@ static sal_Bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
return sal_False;
if ( !bPreNotify )
{
- pWindow->ImplGetWindowImpl()->mbCommand = sal_False;
+ pWindow->ImplGetWindowImpl()->mbCommand = false;
pWindow->Command( aCEvt );
if ( aDelData.IsDead() )
return sal_False;
@@ -1555,7 +1555,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
{
pWindow->mnOutWidth = nNewWidth;
pWindow->mnOutHeight = nNewHeight;
- pWindow->ImplGetWindowImpl()->mbWaitSystemResize = sal_False;
+ pWindow->ImplGetWindowImpl()->mbWaitSystemResize = false;
if ( pWindow->IsReallyVisible() )
pWindow->ImplSetClipFlag();
if ( pWindow->IsVisible() || pWindow->ImplGetWindow()->ImplGetWindowImpl()->mbAllResize ||
@@ -1592,7 +1592,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
pWindow->ImplCallResize(); // otherwise menus cannot be positioned
}
else
- pWindow->ImplGetWindowImpl()->mbCallResize = sal_True;
+ pWindow->ImplGetWindowImpl()->mbCallResize = true;
}
}
@@ -1624,7 +1624,7 @@ static void ImplHandleMove( Window* pWindow )
if ( pWindow->IsVisible() )
pWindow->ImplCallMove();
else
- pWindow->ImplGetWindowImpl()->mbCallMove = sal_True; // make sure the framepos will be updated on the next Show()
+ pWindow->ImplGetWindowImpl()->mbCallMove = true; // make sure the framepos will be updated on the next Show()
if ( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplGetWindowImpl()->mpClientWindow )
pWindow->ImplGetWindowImpl()->mpClientWindow->ImplCallMove(); // notify client to update geometry
@@ -1734,11 +1734,11 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl)
Window* pOldOverlapWindow = pOldFocusWindow->ImplGetFirstOverlapWindow();
Window* pOldRealWindow = pOldOverlapWindow->ImplGetWindow();
- pOldOverlapWindow->ImplGetWindowImpl()->mbActive = sal_False;
+ pOldOverlapWindow->ImplGetWindowImpl()->mbActive = false;
pOldOverlapWindow->Deactivate();
if ( pOldRealWindow != pOldOverlapWindow )
{
- pOldRealWindow->ImplGetWindowImpl()->mbActive = sal_False;
+ pOldRealWindow->ImplGetWindowImpl()->mbActive = false;
pOldRealWindow->Deactivate();
}
}
@@ -2153,7 +2153,7 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent )
nType = DATACHANGED_DISPLAY;
break;
case SALEVENT_FONTCHANGED:
- OutputDevice::ImplUpdateAllFontData( sal_True );
+ OutputDevice::ImplUpdateAllFontData( true );
nType = DATACHANGED_FONTS;
break;
case SALEVENT_DATETIMECHANGED:
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 3746f2958465..8d27cd69b749 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -166,7 +166,7 @@ void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDispla
xCanvasComponent->dispose();
}
- mpWindowImpl->mpFrameWindow->mpWindowImpl->mbWaitSystemResize = sal_True;
+ mpWindowImpl->mpFrameWindow->mpWindowImpl->mbWaitSystemResize = true;
ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplayScreen );
}
}
@@ -241,7 +241,7 @@ sal_Bool WorkWindow::SetPluginParent( SystemParentData* pParent )
bool bWasDnd = Window::ImplStopDnd();
sal_Bool bShown = IsVisible();
- Show( sal_False );
+ Show( false );
sal_Bool bRet = mpWindowImpl->mpFrame->SetPluginParent( pParent );
Show( bShown );
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index a649c1523aa8..84d2e441a436 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -170,7 +170,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
maClientData.aInputEv.mpTextAttr = NULL;
maClientData.aInputEv.mnCursorPos = 0;
maClientData.aInputEv.mnCursorFlags = 0;
- maClientData.aInputEv.mbOnlyCursor = sal_False;
+ maClientData.aInputEv.mbOnlyCursor = false;
SalI18N_InputMethod *pInputMethod;
pInputMethod = GetGenericData()->GetSalDisplay()->GetInputMethod();
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index bc89b6e47ef8..85bbdeef7771 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -154,7 +154,7 @@ void XIMStatusWindow::layout()
m_aStatusText.SetPosSizePixel( Point( 1, 1 ), aControlSize );
m_aStatusText.SetFont( aFont );
- m_aStatusText.Show( sal_True );
+ m_aStatusText.Show( true );
if (m_bAnchoredAtRight && IsVisible())
{
@@ -246,7 +246,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent )
{
setText( OUString() );
m_pLastParent = pParent;
- Show( sal_False, SHOW_NOACTIVATE );
+ Show( false, SHOW_NOACTIVATE );
}
if( IsVisible() )
{
@@ -348,7 +348,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) :
m_aStatusBtn.SetSelectHdl( LINK( this, IIIMPStatusWindow, SelectHdl ) );
m_aStatusBtn.SetPopupMenu( &m_aMenu );
- m_aStatusBtn.Show( sal_True );
+ m_aStatusBtn.Show( true );
const ::std::vector< I18NStatus::ChoiceData >& rChoices( I18NStatus::get().getChoices() );
int i = 1;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c8a78e4b655e..bfbc5582d7b1 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1820,7 +1820,7 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture )
if( ret != GrabSuccess )
{
- DBG_ASSERT( 1, "SalDisplay::CaptureMouse could not grab pointer\n");
+ DBG_ASSERT( true, "SalDisplay::CaptureMouse could not grab pointer\n");
return -1;
}
}
@@ -2736,7 +2736,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
if( m_hColormap )
{
- DBG_ASSERT( 1, "SalColormap::GetColor() !hColormap_\n" );
+ DBG_ASSERT( true, "SalColormap::GetColor() !hColormap_\n" );
return nPixel;
}
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index cc443a5948ac..29b5b47a8c1b 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -142,7 +142,7 @@ X11SalGraphics::X11SalGraphics()
bInvert50GC_ = sal_False;
bStippleGC_ = sal_False;
bTrackingGC_ = sal_False;
- bXORMode_ = sal_False;
+ bXORMode_ = false;
bDitherBrush_ = sal_False;
}
@@ -1027,22 +1027,22 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
// nothing to do for empty polypolygons
const int nOrigPolyCount = rOrigPolyPoly.count();
if( nOrigPolyCount <= 0 )
- return sal_True;
+ return true;
// nothing to do if everything is transparent
if( (nBrushColor_ == SALCOLOR_NONE)
&& (nPenColor_ == SALCOLOR_NONE) )
- return sal_True;
+ return true;
// cannot handle pencolor!=brushcolor yet
if( (nPenColor_ != SALCOLOR_NONE)
&& (nPenColor_ != nBrushColor_) )
- return sal_False;
+ return false;
// TODO: remove the env-variable when no longer needed
static const char* pRenderEnv = getenv( "SAL_DISABLE_RENDER_POLY" );
if( pRenderEnv )
- return sal_False;
+ return false;
// snap to raster if requested
basegfx::B2DPolyPolygon aPolyPoly = rOrigPolyPoly;
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 5d11f00e73a0..6b1aabe93a91 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -495,11 +495,11 @@ void X11SalGraphics::drawBitmap( const SalTwoRect& rPosAry,
DBG_ASSERT( !bPrinter_, "Drawing of transparent bitmaps on printer devices is strictly forbidden" );
// decide if alpha masking or transparency masking is needed
- BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rMaskBitmap).AcquireBuffer( sal_True );
+ BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rMaskBitmap).AcquireBuffer( true );
if( pAlphaBuffer != NULL )
{
int nMaskFormat = pAlphaBuffer->mnFormat;
- const_cast<SalBitmap&>(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, sal_True );
+ const_cast<SalBitmap&>(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, true );
if( nMaskFormat == BMP_FORMAT_8BIT_PAL )
drawAlphaBitmap( rPosAry, rSrcBitmap, rMaskBitmap );
}
@@ -578,7 +578,7 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect& rPosAry,
// #105055# Disable XOR temporarily
sal_Bool bOldXORMode( bXORMode_ );
- bXORMode_ = sal_False;
+ bXORMode_ = false;
// copy pixmap #2 (result) to background
XCopyArea( pXDisp, aBG, aDrawable, GetCopyGC(),
@@ -662,7 +662,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
// TODO: use SalX11Bitmap functionality and caching for the Alpha Pixmap
// problem is that they don't provide an 8bit Pixmap on a non-8bit display
- BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rAlphaBmp).AcquireBuffer( sal_True );
+ BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rAlphaBmp).AcquireBuffer( true );
// an XImage needs its data top_down
// TODO: avoid wrongly oriented images in upper layers!
@@ -707,7 +707,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
if( pAlphaBits != (char*)pAlphaBuffer->mpBits )
delete[] pAlphaBits;
- const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, sal_True );
+ const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, true );
XRenderPictureAttributes aAttr;
aAttr.repeat = int(true);
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 5fe3dbb3ed94..bd3379ad30b3 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -313,7 +313,7 @@ void PrinterInfoManager::initialize()
m_aGlobalDefaults.m_aContext.
setValue( pKey,
aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
- sal_True );
+ true );
}
}
}
@@ -500,7 +500,7 @@ void PrinterInfoManager::initialize()
aPrinter.m_aInfo.m_aContext.
setValue( pKey,
aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
- sal_True );
+ true );
}
}
}
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 2a4a8867dbe8..e06003daf599 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2977,7 +2977,7 @@ void X11SalFrame::beginUnicodeSequence()
aEv.mpTextAttr = &nTextAttr;
aEv.mnCursorPos = 0;
aEv.mnCursorFlags = 0;
- aEv.mbOnlyCursor = sal_False;
+ aEv.mbOnlyCursor = false;
CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
}
@@ -3006,7 +3006,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
aEv.mpTextAttr = &attribs[0];
aEv.mnCursorPos = 0;
aEv.mnCursorFlags = 0;
- aEv.mbOnlyCursor = sal_False;
+ aEv.mbOnlyCursor = false;
CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
bRet = true;
@@ -3038,7 +3038,7 @@ bool X11SalFrame::endUnicodeSequence()
aEv.mpTextAttr = &nTextAttr;
aEv.mnCursorPos = 0;
aEv.mnCursorFlags = 0;
- aEv.mbOnlyCursor = sal_False;
+ aEv.mbOnlyCursor = false;
CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
}
}
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 3652f66db4b4..cb7462d83154 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -692,7 +692,7 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType,
Rectangle aForward;
Rectangle aBackward;
- rIsInside = sal_False;
+ rIsInside = false;
ControlPart nCounterPart = 0;
if ( nPart == PART_BUTTON_UP )
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 037807dcf82f..38ea02318e32 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1560,11 +1560,11 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha )
g_return_val_if_fail( pSalBitmap != NULL, NULL );
g_return_val_if_fail( pSalAlpha != NULL, NULL );
- BitmapBuffer *pBitmap = pSalBitmap->AcquireBuffer( sal_True );
+ BitmapBuffer *pBitmap = pSalBitmap->AcquireBuffer( true );
g_return_val_if_fail( pBitmap != NULL, NULL );
g_return_val_if_fail( pBitmap->mnBitCount == 24, NULL );
- BitmapBuffer *pAlpha = pSalAlpha->AcquireBuffer( sal_True );
+ BitmapBuffer *pAlpha = pSalAlpha->AcquireBuffer( true );
g_return_val_if_fail( pAlpha != NULL, NULL );
g_return_val_if_fail( pAlpha->mnBitCount == 8, NULL );
@@ -1599,8 +1599,8 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha )
}
}
- pSalBitmap->ReleaseBuffer( pBitmap, sal_True );
- pSalAlpha->ReleaseBuffer( pAlpha, sal_True );
+ pSalBitmap->ReleaseBuffer( pBitmap, true );
+ pSalAlpha->ReleaseBuffer( pAlpha, true );
return gdk_pixbuf_new_from_data( pPixbufData,
GDK_COLORSPACE_RGB, sal_True, 8,