diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
| commit | e8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch) | |
| tree | dae18a3acbf29c192118e7c003f80df8da8e21ae /svx | |
| parent | 1c8402465cfd4df862409dc310f5f099d044c4d8 (diff) | |
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'svx')
61 files changed, 264 insertions, 264 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 4dfbf8c363b2..6a920a7e6c53 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -147,7 +147,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) IsValid(); Reference< XAccessible > xRet; if(meBorder == FRAMEBORDER_NONE) - xRet = mpFrameSel->GetParent()->GetAccessible( sal_True ); + xRet = mpFrameSel->GetParent()->GetAccessible( true ); else xRet = mpFrameSel->CreateAccessible(); return xRet; diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 398d3835f659..7f63a4cbfde0 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -115,7 +115,7 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( ) IsValid(); uno::Reference< XAccessible > xRet; if(pPixelCtl) - xRet = pPixelCtl->GetParent()->GetAccessible( sal_True ); + xRet = pPixelCtl->GetParent()->GetAccessible( true ); return xRet; } diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 112c544a0970..14b4685ffe81 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -261,7 +261,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F VirtualDevice aVirDev( 1 ); aVirDev.SetMapMode( MAP_100TH_MM ); aVirDev.SetFont( aFont ); - aVirDev.EnableRTL( sal_True ); + aVirDev.EnableRTL( true ); if ( aParagraphIter->nFrameDirection == FRMDIR_HORI_RIGHT_TOP ) aVirDev.SetLayoutMode( TEXT_LAYOUT_BIDI_RTL ); @@ -281,7 +281,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F { FWCharacterData aCharacterData; OUString aCharText( (sal_Unicode)rText[ i ] ); - if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, -1, sal_True, nWidth, pDXArry ) ) + if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, -1, true, nWidth, pDXArry ) ) { sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText); std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin(); @@ -339,7 +339,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F aVirDev.SetFont( aFont ); } FWCharacterData aCharacterData; - if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, -1, sal_True, nWidth, pDXArry ) ) + if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, -1, true, nWidth, pDXArry ) ) { aParagraphIter->vCharacters.push_back( aCharacterData ); } diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 4f91aaa17027..80d2bfe80460 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -239,7 +239,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) pSet->SelectItem( 1 ); pSet->Select(); - pMask->aTbxPipette.CheckItem( TBI_PIPETTE, sal_True ); + pMask->aTbxPipette.CheckItem( TBI_PIPETTE, true ); PipetteHdl( &( pMask->aTbxPipette ) ); } @@ -567,7 +567,7 @@ void SvxBmpMask::onSelect( MaskSet* pSet ) //------------------------------------------------------------------------- -sal_Bool SvxBmpMask::Close() +bool SvxBmpMask::Close() { SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, false ); GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L ); @@ -627,30 +627,30 @@ void SvxBmpMask::PipetteClicked() { if( pQSet1->GetSelectItemId() == 1 ) { - aCbx1.Check( sal_True ); + aCbx1.Check( true ); pData->CbxHdl( &aCbx1 ); pQSet1->SetItemColor( 1, aPipetteColor ); } else if( pQSet2->GetSelectItemId() == 1 ) { - aCbx2.Check( sal_True ); + aCbx2.Check( true ); pData->CbxHdl( &aCbx2 ); pQSet2->SetItemColor( 1, aPipetteColor ); } else if( pQSet3->GetSelectItemId() == 1 ) { - aCbx3.Check( sal_True ); + aCbx3.Check( true ); pData->CbxHdl( &aCbx3 ); pQSet3->SetItemColor( 1, aPipetteColor ); } else if( pQSet4->GetSelectItemId() == 1 ) { - aCbx4.Check( sal_True ); + aCbx4.Check( true ); pData->CbxHdl( &aCbx4 ); pQSet4->SetItemColor( 1, aPipetteColor ); } - aTbxPipette.CheckItem( TBI_PIPETTE, sal_False ); + aTbxPipette.CheckItem( TBI_PIPETTE, false ); pData->PipetteHdl( &aTbxPipette ); } @@ -1067,7 +1067,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C const Size& rPrefSize = rMtf.GetPrefSize(); const size_t nActionCount = rMtf.GetActionSize(); - aVDev.EnableOutput( sal_False ); + aVDev.EnableOutput( false ); aMtf.Record( &aVDev ); aMtf.SetPrefSize( rPrefSize ); aMtf.SetPrefMapMode( rPrefMap ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 49bd85526c85..c5c23530a6b4 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -298,7 +298,7 @@ void SvxSuperContourDlg::Resize() // Close methods -sal_Bool SvxSuperContourDlg::Close() +bool SvxSuperContourDlg::Close() { sal_Bool bRet = sal_True; @@ -444,7 +444,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) ) aContourWnd.SetWorkplaceMode( sal_True ); else - aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); + aTbx1.CheckItem( TBI_WORKPLACE, false ); } else aContourWnd.SetWorkplaceMode( sal_False ); @@ -453,21 +453,21 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_SELECT ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); aContourWnd.SetEditMode( sal_True ); } break; case( TBI_RECT ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); aContourWnd.SetObjKind( OBJ_RECT ); } break; case( TBI_CIRCLE ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); aContourWnd.SetObjKind( OBJ_CIRC ); } @@ -475,14 +475,14 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_POLY ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); aContourWnd.SetObjKind( OBJ_POLY ); } break; case( TBI_FREEPOLY ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); aContourWnd.SetObjKind( OBJ_FREEFILL ); } break; @@ -675,13 +675,13 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) break; } - aTbx1.CheckItem( nId, sal_True ); + aTbx1.CheckItem( nId, true ); } else { - aTbx1.CheckItem( TBI_POLYEDIT, sal_False ); - aTbx1.CheckItem( TBI_POLYMOVE, sal_True ); - aTbx1.CheckItem( TBI_POLYINSERT, sal_False ); + aTbx1.CheckItem( TBI_POLYEDIT, false ); + aTbx1.CheckItem( TBI_POLYMOVE, true ); + aTbx1.CheckItem( TBI_POLYINSERT, false ); pWnd->SetPolyEditMode( 0 ); } @@ -752,7 +752,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) LeaveWait(); } - aTbx1.CheckItem( TBI_PIPETTE, sal_False ); + aTbx1.CheckItem( TBI_PIPETTE, false ); pWnd->SetPipetteMode( sal_False ); aStbStatus.Invalidate(); @@ -761,8 +761,8 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) { - aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); - aTbx1.CheckItem( TBI_SELECT, sal_True ); + aTbx1.CheckItem( TBI_WORKPLACE, false ); + aTbx1.CheckItem( TBI_SELECT, true ); pWnd->SetWorkplaceMode( sal_False ); return 0L; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 0339bee020be..51b270f35dd5 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -81,7 +81,7 @@ void SvxShowCharSet::init() SetStyle( GetStyle() | WB_CLIPCHILDREN ); aVscrollSB.SetScrollHdl( LINK( this, SvxShowCharSet, VscrollHdl ) ); - aVscrollSB.EnableDrag( sal_True ); + aVscrollSB.EnableDrag( true ); // other settings like aVscroll depend on selected font => see SetFont bDrag = sal_False; @@ -532,7 +532,7 @@ void SvxShowCharSet::SetFont( const Font& rFont ) aFont.SetAlign( ALIGN_TOP ); int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT); aFont.SetSize( PixelToLogic( Size( 0, nFontHeight ) ) ); - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); Control::SetFont( aFont ); GetFontCharMap( maFontCharMap ); diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index c66a5ed7d7cf..6f756cff9dac 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -52,7 +52,7 @@ class SvxSuperContourDlg : public SvxContourDlg ImageList maImageList; virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); DECL_LINK( Tbx1ClickHdl, ToolBox* ); DECL_LINK( MousePosHdl, ContourWindow* ); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 0ce12531dd7e..0057afc771e3 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -580,8 +580,8 @@ SvxTPFilter::SvxTPFilter( Window * pParent) m_pLbAuthor->SetAccessibleName(m_pCbAuthor->GetText()); m_pEdComment->SetAccessibleName(m_pCbComment->GetText()); - m_pDfDate->SetShowDateCentury( sal_True ); - m_pDfDate2->SetShowDateCentury( sal_True ); + m_pDfDate->SetShowDateCentury( true ); + m_pDfDate2->SetShowDateCentury( true ); m_pLbDate->SelectEntryPos(0); m_pLbDate->SetSelectHdl( LINK( this, SvxTPFilter, SelDateHdl ) ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 2680fa396fb8..fa2ed6eb18f1 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -45,7 +45,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) : mnCenterX(0), mnCenterY(0) { - EnableRTL( sal_False ); + EnableRTL( false ); } void DialControlBmp::InitBitmap(const Font& rFont) @@ -170,7 +170,7 @@ void DialControlBmp::DrawBackground() SetFillColor(); Erase(); - EnableRTL( sal_True ); // draw 3D effect in correct direction + EnableRTL( true ); // draw 3D effect in correct direction sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10; Color aColor; @@ -197,7 +197,7 @@ void DialControlBmp::DrawBackground() SetFillColor( aColor ); DrawPie( maRect, maRect.TopLeft(), maRect.LeftCenter() ); - EnableRTL( sal_False ); + EnableRTL( false ); // *** calibration *** @@ -432,7 +432,7 @@ void DialControl::SetModifyHdl( const Link& rLink ) void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) { mpImpl->Init( rWinSize, rWinFont ); - EnableRTL( sal_False ); // don't mirror mouse handling + EnableRTL( false ); // don't mirror mouse handling SetOutputSizePixel( mpImpl->maWinSize ); SetBackground(); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 61563c735e8e..376897ba74a7 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -83,7 +83,7 @@ void Svx3DPreviewControl::Construct() { // Do never mirror the preview window. This explicitly includes right // to left writing environments. - EnableRTL (sal_False); + EnableRTL (false); SetMapMode( MAP_100TH_MM ); // Model diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 430642f1141d..b0614b70d67d 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1159,7 +1159,7 @@ void ColorLB::Fill( const XColorListRef &pColorTab ) long nCount = pColorTab->Count(); XColorEntry* pEntry; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1168,7 +1168,7 @@ void ColorLB::Fill( const XColorListRef &pColorTab ) } AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /************************************************************************/ @@ -1193,7 +1193,7 @@ void FillAttrLB::Fill( const XColorListRef &pColorTab ) { long nCount = pColorTab->Count(); XColorEntry* pEntry; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1202,7 +1202,7 @@ void FillAttrLB::Fill( const XColorListRef &pColorTab ) } AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } // Fills the listbox (provisional) with strings @@ -1234,7 +1234,7 @@ void HatchingLB::Fill( const XHatchListRef &pList ) XHatchEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1247,7 +1247,7 @@ void HatchingLB::Fill( const XHatchListRef &pList ) } AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /************************************************************************/ @@ -1288,7 +1288,7 @@ void FillAttrLB::Fill( const XHatchListRef &pList ) { long nCount = pList->Count(); XHatchEntry* pEntry; - ListBox::SetUpdateMode( sal_False ); + ListBox::SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1301,7 +1301,7 @@ void FillAttrLB::Fill( const XHatchListRef &pList ) } AdaptDropDownLineCountToMaximum(); - ListBox::SetUpdateMode( sal_True ); + ListBox::SetUpdateMode( true ); } // Fills the listbox (provisional) with strings @@ -1333,7 +1333,7 @@ void GradientLB::Fill( const XGradientListRef &pList ) XGradientEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1346,7 +1346,7 @@ void GradientLB::Fill( const XGradientListRef &pList ) } AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /************************************************************************/ @@ -1411,7 +1411,7 @@ void FillAttrLB::Fill( const XGradientListRef &pList ) { long nCount = pList->Count(); XGradientEntry* pEntry; - ListBox::SetUpdateMode( sal_False ); + ListBox::SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1424,7 +1424,7 @@ void FillAttrLB::Fill( const XGradientListRef &pList ) } AdaptDropDownLineCountToMaximum(); - ListBox::SetUpdateMode( sal_True ); + ListBox::SetUpdateMode( true ); } // BitmapLB Constructor @@ -1598,7 +1598,7 @@ void FillAttrLB::Fill( const XBitmapListRef &pList ) void FillTypeLB::Fill() { - SetUpdateMode( sal_False ); + SetUpdateMode( false ); InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) ); InsertEntry( SVX_RESSTR(RID_SVXSTR_COLOR) ); @@ -1607,7 +1607,7 @@ void FillTypeLB::Fill() InsertEntry( SVX_RESSTR(RID_SVXSTR_BITMAP) ); AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } LineLB::LineLB(Window* pParent, WinBits aWB) @@ -1666,7 +1666,7 @@ void LineLB::Fill( const XDashListRef &pList ) long nCount = pList->Count(); XDashEntry* pEntry; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1681,7 +1681,7 @@ void LineLB::Fill( const XDashListRef &pList ) } AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /************************************************************************/ @@ -1750,7 +1750,7 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) long nCount = pList->Count(); XLineEndEntry* pEntry; VirtualDevice aVD; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); for( long i = 0; i < nCount; i++ ) { @@ -1759,7 +1759,7 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) if( !aBitmap.IsEmpty() ) { Size aBmpSize( aBitmap.GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, sal_False ); + aVD.SetOutputSizePixel( aBmpSize, false ); aVD.DrawBitmap( Point(), aBitmap ); InsertEntry( pEntry->GetName(), Image(aVD.GetBitmap( @@ -1772,7 +1772,7 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) } AdaptDropDownLineCountToMaximum(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /************************************************************************/ diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index d5865b4fb4b6..6ce388eeefe3 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -93,7 +93,7 @@ namespace // ----------------------------------------------------------------------- void initFont(Font& _rFont) { - _rFont.SetTransparent(sal_True); + _rFont.SetTransparent(true); _rFont.SetAlign(ALIGN_BASELINE); } // ----------------------------------------------------------------------- @@ -119,7 +119,7 @@ namespace void setFont( const SvxFont& rNewFont, SvxFont& rImplFont ) { rImplFont = rNewFont; - rImplFont.SetTransparent( sal_True ); + rImplFont.SetTransparent( true ); rImplFont.SetAlign( ALIGN_BASELINE ); } diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 9133ef12f30b..7e75eea7d48f 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -94,7 +94,7 @@ SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) , maStdFont(GetFont()) , mbUseFont(false) { - maStdFont.SetTransparent(sal_True); + maStdFont.SetTransparent(true); maEntryFont = maStdFont; } diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 769176ea2408..5620c82a470b 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -341,16 +341,16 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) // Make sure that there is always exactly one checked toolbox item. if ( pItem->GetValue() == XFT_NONE ) { - aTbxStyle.CheckItem(TBI_STYLE_ROTATE, sal_False); - aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, sal_False); - aTbxStyle.CheckItem(TBI_STYLE_SLANTX, sal_False); - aTbxStyle.CheckItem(TBI_STYLE_SLANTY, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_ROTATE, false); + aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, false); + aTbxStyle.CheckItem(TBI_STYLE_SLANTX, false); + aTbxStyle.CheckItem(TBI_STYLE_SLANTY, false); - aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_True); + aTbxStyle.CheckItem(TBI_STYLE_OFF, true); } else { - aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_OFF, false); aTbxStyle.CheckItem(nId); } diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index e4c59655743a..d4c61d63715a 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -72,7 +72,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : aUpdateTimer.SetTimeout( 500 ); aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) ); aUpdateTimer.Start(); - EnableRTL( sal_False ); + EnableRTL( false ); } GraphCtrl::GraphCtrl( Window* pParent, WinBits nStyle ) : @@ -92,7 +92,7 @@ GraphCtrl::GraphCtrl( Window* pParent, WinBits nStyle ) : aUpdateTimer.SetTimeout( 500 ); aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) ); aUpdateTimer.Start(); - EnableRTL( sal_False ); + EnableRTL( false ); } extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGraphCtrl(Window *pParent, VclBuilder::stringmap &rMap) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index e6a2b5306347..9b2032248e64 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -192,7 +192,7 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId m_pPageLbl->Show(); InitHandler(); - m_pBspWin->EnableRTL( sal_False ); + m_pBspWin->EnableRTL( false ); // This Page needs ExchangeSupport SetExchangeSupport(); @@ -404,10 +404,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) if ( !pSetItem ) { - m_pTurnOnBox->Check( sal_False ); - m_pHeightDynBtn->Check( sal_True ); - m_pCntSharedBox->Check( sal_True ); - m_pCntSharedFirstBox->Check( sal_True ); + m_pTurnOnBox->Check( false ); + m_pHeightDynBtn->Check( true ); + m_pCntSharedBox->Check( true ); + m_pCntSharedFirstBox->Check( true ); } TurnOnHdl(0); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index c1ab88dc392f..1f78f78116df 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -159,7 +159,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() ); aTbxIMapDlg1.SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) ); - aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); + aTbxIMapDlg1.CheckItem( TBI_SELECT, true ); TbxClickHdl( &aTbxIMapDlg1 ); SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); @@ -218,7 +218,7 @@ void SvxIMapDlg::Resize() } } -sal_Bool SvxIMapDlg::Close() +bool SvxIMapDlg::Close() { sal_Bool bRet = sal_True; @@ -347,7 +347,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_SELECT ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); pIMapWnd->SetEditMode( sal_True ); if( pTbx->IsKeyEvent() ) { @@ -361,7 +361,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_RECT ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); pIMapWnd->SetObjKind( OBJ_RECT ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -373,7 +373,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_CIRCLE ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); pIMapWnd->SetObjKind( OBJ_CIRC ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -385,7 +385,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_POLY ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); pIMapWnd->SetObjKind( OBJ_POLY ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -397,7 +397,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_FREEPOLY ): { - pTbx->CheckItem( nNewItemId, sal_True ); + pTbx->CheckItem( nNewItemId, true ); pIMapWnd->SetObjKind( OBJ_FREEFILL ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -599,7 +599,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) if ( !rInfo.bOneMarked ) { - aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.CheckItem( TBI_ACTIVE, false ); aTbxIMapDlg1.EnableItem( TBI_ACTIVE, false ); aTbxIMapDlg1.EnableItem( TBI_MACRO, false ); aTbxIMapDlg1.EnableItem( TBI_PROPERTY, false ); @@ -736,7 +736,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl) SetEditingObject( pOwnData->pUpdateEditingObject ); // After changes => default selection - aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); + aTbxIMapDlg1.CheckItem( TBI_SELECT, true ); pIMapWnd->SetEditMode( sal_True ); } @@ -787,13 +787,13 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) break; } - aTbxIMapDlg1.CheckItem( nId, sal_True ); + aTbxIMapDlg1.CheckItem( nId, true ); } else { - aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, sal_False ); - aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, sal_True ); - aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, sal_False ); + aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, false ); + aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, true ); + aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, false ); pWnd->SetPolyEditMode( 0 ); } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index bf6b89a1e777..bd7e209c46f4 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -465,19 +465,19 @@ void IMapWindow::Command(const CommandEvent& rCEvt) const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); sal_uIntPtr nMarked = rMarkList.GetMarkCount(); - aMenu.EnableItem( MN_URL, sal_False ); - aMenu.EnableItem( MN_ACTIVATE, sal_False ); - aMenu.EnableItem( MN_MACRO, sal_False ); + aMenu.EnableItem( MN_URL, false ); + aMenu.EnableItem( MN_ACTIVATE, false ); + aMenu.EnableItem( MN_MACRO, false ); aMenu.EnableItem( MN_MARK_ALL, pModel->GetPage( 0 )->GetObjCount() != pView->GetMarkedObjectCount() ); if ( !nMarked ) { - aMenu.EnableItem( MN_POSITION, sal_False ); - aMenu.EnableItem( MN_FRAME_TO_TOP, sal_False ); - aMenu.EnableItem( MN_MOREFRONT, sal_False ); - aMenu.EnableItem( MN_MOREBACK, sal_False ); - aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_False ); - aMenu.EnableItem( MN_DELETE1, sal_False ); + aMenu.EnableItem( MN_POSITION, false ); + aMenu.EnableItem( MN_FRAME_TO_TOP, false ); + aMenu.EnableItem( MN_MOREFRONT, false ); + aMenu.EnableItem( MN_MOREBACK, false ); + aMenu.EnableItem( MN_FRAME_TO_BOTTOM, false ); + aMenu.EnableItem( MN_DELETE1, false ); } else { @@ -485,18 +485,18 @@ void IMapWindow::Command(const CommandEvent& rCEvt) { SdrObject* pSdrObj = GetSelectedSdrObject(); - aMenu.EnableItem( MN_URL, sal_True ); - aMenu.EnableItem( MN_ACTIVATE, sal_True ); - aMenu.EnableItem( MN_MACRO, sal_True ); + aMenu.EnableItem( MN_URL, true ); + aMenu.EnableItem( MN_ACTIVATE, true ); + aMenu.EnableItem( MN_MACRO, true ); aMenu.CheckItem( MN_ACTIVATE, GetIMapObj( pSdrObj )->IsActive() ); } - aMenu.EnableItem( MN_POSITION, sal_True ); - aMenu.EnableItem( MN_FRAME_TO_TOP, sal_True ); - aMenu.EnableItem( MN_MOREFRONT, sal_True ); - aMenu.EnableItem( MN_MOREBACK, sal_True ); - aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_True ); - aMenu.EnableItem( MN_DELETE1, sal_True ); + aMenu.EnableItem( MN_POSITION, true ); + aMenu.EnableItem( MN_FRAME_TO_TOP, true ); + aMenu.EnableItem( MN_MOREFRONT, true ); + aMenu.EnableItem( MN_MOREBACK, true ); + aMenu.EnableItem( MN_FRAME_TO_BOTTOM, true ); + aMenu.EnableItem( MN_DELETE1, true ); } aMenu.SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) ); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 7054c898548e..2bcd6b9d9c2c 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -279,12 +279,12 @@ void SvxRubyDialog::ClearCharStyleList() m_pCharStyleLB->Clear(); } -sal_Bool SvxRubyDialog::Close() +bool SvxRubyDialog::Close() { pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - return sal_True; + return true; } void SvxRubyDialog::Activate() diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 840d0b984488..43465e18ffc5 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -415,7 +415,7 @@ void SvxSearchDialog::Construct_Impl() SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsJapaneseFindEnabled()) { - m_pJapOptionsCB->Check( sal_False ); + m_pJapOptionsCB->Check( false ); m_pJapOptionsCB->Hide(); m_pJapOptionsBtn->Hide(); } @@ -426,7 +426,7 @@ void SvxSearchDialog::Construct_Impl() SvtCTLOptions aCTLOptions; if(!aCTLOptions.IsCTLFontEnabled()) { - m_pIgnoreDiacritics->Check( sal_False ); + m_pIgnoreDiacritics->Check( false ); m_pIgnoreDiacritics->Hide(); } //component extension - show component search buttons if the commands @@ -494,7 +494,7 @@ void SvxSearchDialog::Construct_Impl() // ----------------------------------------------------------------------- -sal_Bool SvxSearchDialog::Close() +bool SvxSearchDialog::Close() { // remember strings speichern if (!aSearchStrings.empty()) @@ -518,7 +518,7 @@ sal_Bool SvxSearchDialog::Close() rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs ); rBindings.Execute( SID_SEARCH_DLG ); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -570,9 +570,9 @@ void SvxSearchDialog::Activate() void SvxSearchDialog::InitControls_Impl() { // CaseSensitives AutoComplete - m_pSearchLB->EnableAutocomplete( sal_True, sal_True ); + m_pSearchLB->EnableAutocomplete( true, true ); m_pSearchLB->Show(); - m_pReplaceLB->EnableAutocomplete( sal_True, sal_True ); + m_pReplaceLB->EnableAutocomplete( true, true ); m_pReplaceLB->Show(); m_pFormatBtn->Disable(); @@ -855,7 +855,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) EnableControl_Impl(m_pSelectionBtn); else { - m_pSelectionBtn->Check( sal_False ); + m_pSelectionBtn->Check( false ); m_pSelectionBtn->Disable(); } } @@ -1066,14 +1066,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( bIsChecked ) { m_pSimilarityBtn->Enable(); - m_pRegExpBtn->Check( sal_False ); + m_pRegExpBtn->Check( false ); m_pRegExpBtn->Disable(); EnableControl_Impl(m_pWordBtn); if ( m_pLayoutBtn->IsChecked() ) { EnableControl_Impl(m_pMatchCaseCB); - m_pLayoutBtn->Check( sal_False ); + m_pLayoutBtn->Check( false ); } m_pRegExpBtn->Disable(); m_pLayoutBtn->Disable(); @@ -1110,11 +1110,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) { if ( m_pLayoutBtn->IsChecked() && !bFormat ) { - m_pWordBtn->Check( sal_False ); + m_pWordBtn->Check( false ); m_pWordBtn->Disable(); - m_pRegExpBtn->Check( sal_False ); + m_pRegExpBtn->Check( false ); m_pRegExpBtn->Disable(); - m_pMatchCaseCB->Check( sal_False ); + m_pMatchCaseCB->Check( false ); m_pMatchCaseCB->Disable(); m_pNotesBtn->Disable(); @@ -1134,7 +1134,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( m_pRegExpBtn->IsChecked() ) { - m_pWordBtn->Check( sal_False ); + m_pWordBtn->Check( false ); m_pWordBtn->Disable(); m_pSimilarityBox->Disable(); m_pSimilarityBtn->Disable(); @@ -1503,8 +1503,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) m_pSearchTmplLB->Clear(); m_pReplaceTmplLB->Clear(); rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL ); - m_pSearchTmplLB->SetUpdateMode( sal_False ); - m_pReplaceTmplLB->SetUpdateMode( sal_False ); + m_pSearchTmplLB->SetUpdateMode( false ); + m_pReplaceTmplLB->SetUpdateMode( false ); SfxStyleSheetBase* pBase = rPool.First(); while ( pBase ) @@ -1514,8 +1514,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) m_pReplaceTmplLB->InsertEntry( pBase->GetName() ); pBase = rPool.Next(); } - m_pSearchTmplLB->SetUpdateMode( sal_True ); - m_pReplaceTmplLB->SetUpdateMode( sal_True ); + m_pSearchTmplLB->SetUpdateMode( true ); + m_pReplaceTmplLB->SetUpdateMode( true ); m_pSearchTmplLB->SelectEntryPos(0); if ( !aOldSrch.isEmpty() ) @@ -1940,7 +1940,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) } bFormat = sal_False; - m_pLayoutBtn->Check( sal_False ); + m_pLayoutBtn->Check( false ); if ( bSearch ) { @@ -1990,7 +1990,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) EnableControl_Impl(m_pSelectionBtn); else { - m_pSelectionBtn->Check( sal_False ); + m_pSelectionBtn->Check( false ); m_pSelectionBtn->Disable(); } } diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index dc42baaf5ab1..00e9c7e96379 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -100,7 +100,7 @@ static Font& lcl_GetDefaultBulletFont() aDefBulletFont.SetFamily( FAMILY_DONTKNOW ); aDefBulletFont.SetPitch( PITCH_DONTKNOW ); aDefBulletFont.SetWeight( WEIGHT_DONTKNOW ); - aDefBulletFont.SetTransparent( sal_True ); + aDefBulletFont.SetTransparent( true ); bInit = sal_True; } return aDefBulletFont; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index f130fa823206..57cadf6c009f 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -712,7 +712,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED); if( eState != SFX_ITEM_DONTCARE ) { - sal_Bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); + bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); if( bValue != aBtnDoubleSided.IsChecked() ) { aBtnDoubleSided.Check( bValue ); @@ -825,9 +825,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnNormalsFlat.IsChecked() || aBtnNormalsSphere.IsChecked() ) { - aBtnNormalsObj.Check( sal_False ); - aBtnNormalsFlat.Check( sal_False ); - aBtnNormalsSphere.Check( sal_False ); + aBtnNormalsObj.Check( false ); + aBtnNormalsFlat.Check( false ); + aBtnNormalsSphere.Check( false ); bUpdate = sal_True; } } @@ -836,7 +836,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT); if( eState != SFX_ITEM_DONTCARE ) { - sal_Bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); + bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); if( bValue != aBtnNormalsInvert.IsChecked() ) { aBtnNormalsInvert.Check( bValue ); @@ -858,7 +858,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); if( eState != SFX_ITEM_DONTCARE ) { - sal_Bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); + bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); if( bValue != aBtnTwoSidedLighting.IsChecked() ) { aBtnTwoSidedLighting.Check( bValue ); @@ -901,7 +901,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D); if( eState != SFX_ITEM_DONTCARE ) { - sal_Bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); + bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); if( bValue != aBtnShadow3d.IsChecked() ) { aBtnShadow3d.Check( bValue ); @@ -1428,8 +1428,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnTexLuminance.IsChecked() || aBtnTexColor.IsChecked() ) { - aBtnTexLuminance.Check( sal_False ); - aBtnTexColor.Check( sal_False ); + aBtnTexLuminance.Check( false ); + aBtnTexColor.Check( false ); bUpdate = sal_True; } } @@ -1453,8 +1453,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnTexReplace.IsChecked() || aBtnTexModulate.IsChecked() ) { - aBtnTexReplace.Check( sal_False ); - aBtnTexModulate.Check( sal_False ); + aBtnTexReplace.Check( false ); + aBtnTexModulate.Check( false ); bUpdate = sal_True; } } @@ -1481,9 +1481,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexParallelX.IsChecked() || aBtnTexCircleX.IsChecked() ) { - aBtnTexObjectX.Check( sal_False ); - aBtnTexParallelX.Check( sal_False ); - aBtnTexCircleX.Check( sal_False ); + aBtnTexObjectX.Check( false ); + aBtnTexParallelX.Check( false ); + aBtnTexCircleX.Check( false ); bUpdate = sal_True; } } @@ -1510,9 +1510,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexParallelY.IsChecked() || aBtnTexCircleY.IsChecked() ) { - aBtnTexObjectY.Check( sal_False ); - aBtnTexParallelY.Check( sal_False ); - aBtnTexCircleY.Check( sal_False ); + aBtnTexObjectY.Check( false ); + aBtnTexParallelY.Check( false ); + aBtnTexCircleY.Check( false ); bUpdate = sal_True; } } @@ -1521,7 +1521,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER); if( eState != SFX_ITEM_DONTCARE ) { - sal_Bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); + bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); if( bValue != aBtnTexFilter.IsChecked() ) { aBtnTexFilter.Check( bValue ); @@ -2662,42 +2662,42 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() ) { - aBtnLight1.Check( sal_False ); + aBtnLight1.Check( false ); aLbLight1.Hide(); } if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() ) { - aBtnLight2.Check( sal_False ); + aBtnLight2.Check( false ); aLbLight2.Hide(); } if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() ) { - aBtnLight3.Check( sal_False ); + aBtnLight3.Check( false ); aLbLight3.Hide(); } if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() ) { - aBtnLight4.Check( sal_False ); + aBtnLight4.Check( false ); aLbLight4.Hide(); } if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() ) { - aBtnLight5.Check( sal_False ); + aBtnLight5.Check( false ); aLbLight5.Hide(); } if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() ) { - aBtnLight6.Check( sal_False ); + aBtnLight6.Check( false ); aLbLight6.Hide(); } if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() ) { - aBtnLight7.Check( sal_False ); + aBtnLight7.Check( false ); aLbLight7.Hide(); } if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() ) { - aBtnLight8.Check( sal_False ); + aBtnLight8.Check( false ); aLbLight8.Hide(); } } @@ -2997,42 +2997,42 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) // Status: No lamp selected if( aBtnLight1.IsChecked() ) { - aBtnLight1.Check( sal_False ); + aBtnLight1.Check( false ); aLbLight1.Enable( false ); } else if( aBtnLight2.IsChecked() ) { - aBtnLight2.Check( sal_False ); + aBtnLight2.Check( false ); aLbLight2.Enable( false ); } else if( aBtnLight3.IsChecked() ) { - aBtnLight3.Check( sal_False ); + aBtnLight3.Check( false ); aLbLight3.Enable( false ); } else if( aBtnLight4.IsChecked() ) { - aBtnLight4.Check( sal_False ); + aBtnLight4.Check( false ); aLbLight4.Enable( false ); } else if( aBtnLight5.IsChecked() ) { - aBtnLight5.Check( sal_False ); + aBtnLight5.Check( false ); aLbLight5.Enable( false ); } else if( aBtnLight6.IsChecked() ) { - aBtnLight6.Check( sal_False ); + aBtnLight6.Check( false ); aLbLight6.Enable( false ); } else if( aBtnLight7.IsChecked() ) { - aBtnLight7.Check( sal_False ); + aBtnLight7.Check( false ); aLbLight7.Enable( false ); } else if( aBtnLight8.IsChecked() ) { - aBtnLight8.Check( sal_False ); + aBtnLight8.Check( false ); aLbLight8.Enable( false ); } aBtnLightColor.Enable( false ); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index ba7d7a236293..25f3511d58d8 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -974,7 +974,7 @@ void FmGridHeader::triggerColumnContextMenu( const ::Point& _rPreferredPos ) // let derivees modify the menu PreExecuteColumnContextMenu( nColId, aContextMenu ); - aContextMenu.RemoveDisabledEntries( sal_True, sal_True ); + aContextMenu.RemoveDisabledEntries( true, true ); // execute the menu sal_uInt16 nResult = aContextMenu.Execute( this, _rPreferredPos ); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 009a83067afe..f0404f09d287 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2090,7 +2090,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() Window* pGrid = GetWindow(); if ( pGrid ) { - Reference< XAccessible > xAcc( pGrid->GetAccessible( sal_True ) ); + Reference< XAccessible > xAcc( pGrid->GetAccessible( true ) ); if ( xAcc.is() ) xContext = xAcc->getAccessibleContext(); // TODO: this has a slight conceptual problem: diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 28d2509e608d..12448a00f118 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -972,7 +972,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ) { if ( m_pPainter->GetParent() == &_rDev ) { - m_pPainter->SetPaintTransparent( sal_True ); + m_pPainter->SetPaintTransparent( true ); m_pPainter->SetBackground( ); m_pPainter->SetControlBackground( _rDev.GetFillColor() ); m_pPainter->SetControlForeground( _rDev.GetTextColor() ); @@ -980,15 +980,15 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ) m_pPainter->SetTextFillColor( _rDev.GetTextColor() ); Font aFont( _rDev.GetFont() ); - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); m_pPainter->SetFont( aFont ); m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() ); m_pPainter->Show(); m_pPainter->Update(); - m_pPainter->SetParentUpdateMode( sal_False ); + m_pPainter->SetParentUpdateMode( false ); m_pPainter->Hide(); - m_pPainter->SetParentUpdateMode( sal_True ); + m_pPainter->SetParentUpdateMode( true ); } else m_pPainter->Draw( &_rDev, _rRect.TopLeft(), _rRect.GetSize(), 0 ); @@ -1670,8 +1670,8 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) m_pWindow = new CheckBoxControl( &rParent ); m_pPainter = new CheckBoxControl( &rParent ); - m_pWindow->SetPaintTransparent( sal_True ); - m_pPainter->SetPaintTransparent( sal_True ); + m_pWindow->SetPaintTransparent( true ); + m_pPainter->SetPaintTransparent( true ); m_pPainter->SetBackground(); @@ -2267,13 +2267,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet > static_cast< DateField* >( m_pWindow )->SetMin( aMin ); static_cast< DateField* >( m_pWindow )->SetMax( aMax ); static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict ); - static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True ); + static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( true ); static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat ); static_cast< DateField* >( m_pPainter )->SetMin( aMin ); static_cast< DateField* >( m_pPainter )->SetMax( aMax ); static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict ); - static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True ); + static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( true ); } } @@ -2379,13 +2379,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet > static_cast< TimeField* >( m_pWindow )->SetMin( aMin ); static_cast< TimeField* >( m_pWindow )->SetMax( aMax ); static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict ); - static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True ); + static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( true ); static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat ); static_cast< TimeField* >( m_pPainter )->SetMin( aMin ); static_cast< TimeField* >( m_pPainter )->SetMax( aMax ); static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict ); - static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True ); + static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( true ); } } @@ -2817,11 +2817,11 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun:: { case ::com::sun::star::form::FormComponentType::CHECKBOX: m_pWindow = new CheckBoxControl(pParent); - m_pWindow->SetPaintTransparent( sal_True ); + m_pWindow->SetPaintTransparent( true ); ((CheckBoxControl*)m_pWindow)->SetClickHdl( LINK( this, DbFilterField, OnClick ) ); m_pPainter = new CheckBoxControl(pParent); - m_pPainter->SetPaintTransparent( sal_True ); + m_pPainter->SetPaintTransparent( true ); m_pPainter->SetBackground(); break; case ::com::sun::star::form::FormComponentType::LISTBOX: @@ -3041,7 +3041,7 @@ void DbFilterField::SetText(const OUString& rText) { Sequence<sal_Int16> aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, true); if (aPosSeq.getLength()) - static_cast<ListBox*>(m_pWindow)->SelectEntryPos(aPosSeq.getConstArray()[0], sal_True); + static_cast<ListBox*>(m_pWindow)->SelectEntryPos(aPosSeq.getConstArray()[0], true); else static_cast<ListBox*>(m_pWindow)->SetNoSelection(); } break; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 29abc1bea421..761426ecba81 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -290,7 +290,7 @@ DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(Window* pParent, WinBits SetSpinSize(1); SetDecimalDigits(0); - SetStrictFormat(sal_True); + SetStrictFormat(true); } void DbGridControl::NavigationBar::AbsolutePos::KeyInput(const KeyEvent& rEvt) @@ -432,7 +432,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() aApplFont.SetSize( pointAbsoluteSize ); m_aAbsolute.SetControlFont( aApplFont ); - aApplFont.SetTransparent( sal_True ); + aApplFont.SetTransparent( true ); m_aRecordText.SetControlFont( aApplFont ); m_aRecordOf.SetControlFont( aApplFont ); m_aRecordCount.SetControlFont( aApplFont ); @@ -603,7 +603,7 @@ sal_Bool DbGridControl::NavigationBar::GetState(sal_uInt16 nWhich) const void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { - sal_Bool bAvailable = GetState(nWhich); + bool bAvailable = GetState(nWhich); DbGridControl* pParent = (DbGridControl*)GetParent(); Window* pWnd = NULL; switch (nWhich) @@ -924,7 +924,7 @@ void DbGridControl::InsertHandleColumn() void DbGridControl::Init() { BrowserHeader* pNewHeader = CreateHeaderBar(this); - pHeader->SetMouseTransparent(sal_False); + pHeader->SetMouseTransparent(false); SetHeaderBar(pNewHeader); SetMode(m_nMode); @@ -1792,7 +1792,7 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_B // ignore any implicitly made updates bool bDisablePaint = !bUpdateCursor && IsPaintEnabled(); if (bDisablePaint) - EnablePaint(sal_False); + EnablePaint(false); // adjust cache to the visible area Reference< XPropertySet > xSet = m_pSeekCursor->getPropertySet(); @@ -1833,7 +1833,7 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_B AdjustRows(); // ignore any updates implicit made - EnablePaint(sal_True); + EnablePaint(true); } void DbGridControl::RowInserted(long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection) @@ -2763,7 +2763,7 @@ void DbGridControl::executeRowContextMenu( long _nRow, const Point& _rPreferredP PopupMenu aContextMenu( SVX_RES( RID_SVXMNU_ROWS ) ); PreExecuteRowContextMenu( (sal_uInt16)_nRow, aContextMenu ); - aContextMenu.RemoveDisabledEntries( sal_True, sal_True ); + aContextMenu.RemoveDisabledEntries( true, true ); PostExecuteRowContextMenu( (sal_uInt16)_nRow, aContextMenu, aContextMenu.Execute( this, _rPreferredPos ) ); // TODO: why this weird cast to sal_uInt16? What if we really have more than 65535 lines? @@ -2806,7 +2806,7 @@ void DbGridControl::Command(const CommandEvent& rEvt) else if (canCopyCellText(nRow, nColId)) { PopupMenu aContextMenu(SVX_RES(RID_SVXMNU_CELL)); - aContextMenu.RemoveDisabledEntries(sal_True, sal_True); + aContextMenu.RemoveDisabledEntries(true, true); switch (aContextMenu.Execute(this, rEvt.GetMousePosPixel())) { case SID_COPY: @@ -3220,7 +3220,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt) // Ctrl-Tab is used to step out of the control, without traveling to the // remaining cells first // -> build a new key event without the Ctrl-key, and let the very base class handle it - KeyCode aNewCode( KEY_TAB, bShift, sal_False, sal_False, sal_False ); + KeyCode aNewCode( KEY_TAB, bShift, false, false, false ); KeyEvent aNewEvent( pKeyEvent->GetCharCode(), aNewCode ); // call the Control - our direct base class will interpret this in a way we do not want (and do diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index d3ad4ba6d803..6437cfe6d3a6 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2209,7 +2209,7 @@ namespace svxform } //----------------------------------------------------------------------- - sal_Bool DataNavigator::Close() + bool DataNavigator::Close() { Update( NULL ); return SfxDockingWindow::Close(); @@ -2661,19 +2661,19 @@ namespace svxform { if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp ) && !sTemp.isEmpty() ) - m_pRequiredCB->Check( sal_True ); + m_pRequiredCB->Check( true ); if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp ) && !sTemp.isEmpty() ) - m_pRelevantCB->Check( sal_True ); + m_pRelevantCB->Check( true ); if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp ) && !sTemp.isEmpty() ) - m_pConstraintCB->Check( sal_True ); + m_pConstraintCB->Check( true ); if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp ) && !sTemp.isEmpty() ) - m_pReadonlyCB->Check( sal_True ); + m_pReadonlyCB->Check( true ); if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp ) && !sTemp.isEmpty() ) - m_pCalculateCB->Check( sal_True ); + m_pCalculateCB->Check( true ); } catch (const Exception&) { diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index e15cb99e6906..5a4583c43b17 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1712,7 +1712,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) aContextMenu.EnableItem( SID_FM_FILTER_IS_NOT_NULL, bEdit ); - aContextMenu.RemoveDisabledEntries(sal_True, sal_True); + aContextMenu.RemoveDisabledEntries(true, true); sal_uInt16 nSlotId = aContextMenu.Execute( this, aWhere ); switch( nSlotId ) { @@ -1948,14 +1948,14 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c } //----------------------------------------------------------------------- -sal_Bool FmFilterNavigatorWin::Close() +bool FmFilterNavigatorWin::Close() { if ( m_pNavigator && m_pNavigator->IsEditingActive() ) m_pNavigator->EndEditing(); if ( m_pNavigator && m_pNavigator->IsEditingActive() ) // the EndEditing was vetoed (perhaps of an syntax error or such) - return sal_False; + return false; UpdateContent( NULL ); return SfxDockingWindow::Close(); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index d380e7057167..1c24dbc2da06 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -337,7 +337,7 @@ void FmPropBrw::implDetachController() } //----------------------------------------------------------------------- -sal_Bool FmPropBrw::Close() +bool FmPropBrw::Close() { // suspend the controller (it is allowed to veto) if ( m_xMeAsFrame.is() ) @@ -346,7 +346,7 @@ sal_Bool FmPropBrw::Close() { Reference< XController > xController( m_xMeAsFrame->getController() ); if ( xController.is() && !xController->suspend( sal_True ) ) - return sal_False; + return false; } catch( const Exception& ) { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index ff39f82502af..3a6076ad15a8 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -634,7 +634,7 @@ namespace svxform } //----------------------------------------------------------------------- - sal_Bool NavigatorFrame::Close() + bool NavigatorFrame::Close() { UpdateContent( NULL ); return SfxDockingWindow::Close(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b1b4241095ef..a382e69ab5d7 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -423,10 +423,10 @@ namespace svxform pFormShell->GetImpl()->checkControlConversionSlotsForCurrentSelection( *aContextMenu.GetPopupMenu( SID_FM_CHANGECONTROLTYPE ) ); } else - aContextMenu.EnableItem( SID_FM_CHANGECONTROLTYPE, sal_False ); + aContextMenu.EnableItem( SID_FM_CHANGECONTROLTYPE, false ); // jetzt alles, was disabled wurde, wech - aContextMenu.RemoveDisabledEntries(sal_True, sal_True); + aContextMenu.RemoveDisabledEntries(true, true); ////////////////////////////////////////////////////////// // OpenReadOnly setzen diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 6ba2729ad025..689e25a2e921 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -287,7 +287,7 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) } //----------------------------------------------------------------------- -sal_Bool FmFieldWin::Close() +bool FmFieldWin::Close() { return SfxFloatingWindow::Close(); } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 9b04305739a1..7bf980cbdb8f 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -63,7 +63,7 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle SetSizePixel( Size(70,19) ); SetDecimalDigits(0); - SetStrictFormat(sal_True); + SetStrictFormat(true); } // ----------------------------------------------------------------------- @@ -395,7 +395,7 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) aSize.Width() += 12; pFixedText->SetSizePixel( aSize ); pFixedText->SetBackground(); - pFixedText->SetPaintTransparent(sal_True); + pFixedText->SetPaintTransparent(true); return pFixedText; } diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index bdd1004083b9..2bb139bdd7b6 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -180,7 +180,7 @@ sal_Bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* ) { if( !rKEvt.GetKeyCode().IsShift() ) { - if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) ) + if( mpBrowser1->mpThemes->HasChildPathFocus( true ) ) mpBrowser2->GetViewWindow()->GrabFocus(); else if( mpBrowser2->GetViewWindow()->HasFocus() ) mpBrowser2->maViewBox.GrabFocus(); @@ -191,7 +191,7 @@ sal_Bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* ) } else { - if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) ) + if( mpBrowser1->mpThemes->HasChildPathFocus( true ) ) mpBrowser1->maNewTheme.GrabFocus(); else if( mpBrowser1->maNewTheme.HasFocus() ) mpBrowser2->maViewBox.GrabFocus(); diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 27275d2b8c9c..cefb64480999 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -196,7 +196,7 @@ sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) { if( !rKEvt.GetKeyCode().IsShift() ) { - if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) ) + if( mpBrowser1->mpThemes->HasChildPathFocus( true ) ) mpBrowser2->GetViewWindow()->GrabFocus(); else if( mpBrowser2->GetViewWindow()->HasFocus() ) mpBrowser2->maViewBox.GrabFocus(); @@ -207,7 +207,7 @@ sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) } else { - if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) ) + if( mpBrowser1->mpThemes->HasChildPathFocus( true ) ) mpBrowser1->maNewTheme.GrabFocus(); else if( mpBrowser1->maNewTheme.HasFocus() ) mpBrowser2->maViewBox.GrabFocus(); @@ -221,7 +221,7 @@ sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) return bRet; } -sal_Bool GalleryBrowser::Close() +bool GalleryBrowser::Close() { return SfxDockingWindow::Close(); } diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 483a83d3f659..f9070ffcb725 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -183,7 +183,7 @@ throw ( css::uno::RuntimeException ) { if ( !rEvent.IsEnabled ) { - maPopupMenu.EnableItem( MN_ADD, sal_False ); + maPopupMenu.EnableItem( MN_ADD, false ); } } else if ( rURL == CMD_SID_GALLERY_BG_BRUSH ) @@ -251,21 +251,21 @@ void GalleryThemePopup::ExecutePopup( Window *pWindow, const ::Point &aPos ) if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() ) { - maPopupMenu.EnableItem( MN_DELETE, sal_False ); - maPopupMenu.EnableItem( MN_TITLE, sal_False ); + maPopupMenu.EnableItem( MN_DELETE, false ); + maPopupMenu.EnableItem( MN_TITLE, false ); if( mpTheme->IsReadOnly() ) - maPopupMenu.EnableItem( MN_PASTECLIPBOARD, sal_False ); + maPopupMenu.EnableItem( MN_PASTECLIPBOARD, false ); if( !mpTheme->GetObjectCount() ) - maPopupMenu.EnableItem( MN_COPYCLIPBOARD, sal_False ); + maPopupMenu.EnableItem( MN_COPYCLIPBOARD, false ); } else { maPopupMenu.EnableItem( MN_DELETE, !mbPreview ); - maPopupMenu.EnableItem( MN_TITLE, sal_True ); - maPopupMenu.EnableItem( MN_COPYCLIPBOARD, sal_True ); - maPopupMenu.EnableItem( MN_PASTECLIPBOARD, sal_True ); + maPopupMenu.EnableItem( MN_TITLE, true ); + maPopupMenu.EnableItem( MN_COPYCLIPBOARD, true ); + maPopupMenu.EnableItem( MN_PASTECLIPBOARD, true ); } #ifdef GALLERY_USE_CLIPBOARD @@ -291,8 +291,8 @@ void GalleryThemePopup::ExecutePopup( Window *pWindow, const ::Point &aPos ) maPopupMenu.EnableItem( MN_PASTECLIPBOARD, sal_False ); } #else - maPopupMenu.EnableItem( MN_COPYCLIPBOARD, sal_False ); - maPopupMenu.EnableItem( MN_PASTECLIPBOARD, sal_False ); + maPopupMenu.EnableItem( MN_COPYCLIPBOARD, false ); + maPopupMenu.EnableItem( MN_PASTECLIPBOARD, false ); #endif // update status @@ -328,10 +328,10 @@ void GalleryThemePopup::ExecutePopup( Window *pWindow, const ::Point &aPos ) } if( !maBackgroundPopup.GetItemCount() || ( eObjKind == SGA_OBJ_SVDRAW ) || ( eObjKind == SGA_OBJ_SOUND ) ) - maPopupMenu.EnableItem( MN_BACKGROUND, sal_False ); + maPopupMenu.EnableItem( MN_BACKGROUND, false ); else { - maPopupMenu.EnableItem( MN_BACKGROUND, sal_True ); + maPopupMenu.EnableItem( MN_BACKGROUND, true ); maPopupMenu.SetPopupMenu( MN_BACKGROUND, &maBackgroundPopup ); maBackgroundPopup.SetSelectHdl( LINK( this, GalleryThemePopup, BackgroundMenuSelectHdl ) ); } @@ -780,7 +780,7 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) maViewBox.EnableItem( TBX_ID_ICON, true ); maViewBox.EnableItem( TBX_ID_LIST, true ); - maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True ); + maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, true ); if(maInfoBar.GetText().isEmpty()) mpIconView->SetAccessibleRelationLabeledBy(mpIconView); @@ -810,8 +810,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) maViewBox.EnableItem( TBX_ID_ICON, true ); maViewBox.EnableItem( TBX_ID_LIST, true ); - maViewBox.CheckItem( TBX_ID_ICON, sal_True ); - maViewBox.CheckItem( TBX_ID_LIST, sal_False ); + maViewBox.CheckItem( TBX_ID_ICON, true ); + maViewBox.CheckItem( TBX_ID_LIST, false ); } break; @@ -828,8 +828,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) maViewBox.EnableItem( TBX_ID_ICON, true ); maViewBox.EnableItem( TBX_ID_LIST, true ); - maViewBox.CheckItem( TBX_ID_ICON, sal_False ); - maViewBox.CheckItem( TBX_ID_LIST, sal_True ); + maViewBox.CheckItem( TBX_ID_ICON, false ); + maViewBox.CheckItem( TBX_ID_LIST, true ); } break; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 331b06753fcb..d9d91c046edb 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -378,7 +378,7 @@ namespace svxform protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void GetFocus(); virtual Size CalcDockingSize( SfxChildAlignment ); virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 1c03f60021e7..adc474e2c1d4 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -321,7 +321,7 @@ private: protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual Size CalcDockingSize( SfxChildAlignment ); virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index e7aff9331c75..4afe9ea66971 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -65,7 +65,7 @@ class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem protected: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState); virtual void FillInfo( SfxChildWinInfo& rInfo ) const; - virtual sal_Bool Close(); + virtual bool Close(); DECL_LINK( OnAsyncGetFocus, void* ); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 319681604fa6..5b5c2898f0ad 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -568,7 +568,7 @@ namespace svxform protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void GetFocus(); virtual Size CalcDockingSize( SfxChildAlignment ); virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 6277bd8186b6..71a4e2a3de45 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -89,7 +89,7 @@ public: virtual ~FmFieldWin(); virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void GetFocus(); virtual bool PreNotify( NotifyEvent& _rNEvt ); virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index b1019314a073..f4921b7be86b 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -83,13 +83,13 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() ToolBox& rBox = GetToolBox(); sal_uInt16 nId = GetId(); - rBox.SetItemDown( nId, sal_True ); + rBox.SetItemDown( nId, true ); pPopup->Execute( &rBox, rBox.GetItemRect( nId ), (rBox.GetAlign() == WINDOWALIGN_TOP || rBox.GetAlign() == WINDOWALIGN_BOTTOM) ? POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT ); - rBox.SetItemDown( nId, sal_False ); + rBox.SetItemDown( nId, false ); SfxUInt32Item aItem( SID_CLIPBOARD_FORMAT_ITEMS, pPopup->GetCurItemId() ); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 0bb2ffbeedb2..27d8599ce416 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -72,7 +72,7 @@ Font& lcl_GetDefaultBulletFont() aDefBulletFont.SetFamily( FAMILY_DONTKNOW ); aDefBulletFont.SetPitch( PITCH_DONTKNOW ); aDefBulletFont.SetWeight( WEIGHT_DONTKNOW ); - aDefBulletFont.SetTransparent( sal_True ); + aDefBulletFont.SetTransparent( true ); bInit = sal_True; } return aDefBulletFont; @@ -1827,7 +1827,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn aCreateFont.SetFamily( FAMILY_DONTKNOW ); aCreateFont.SetPitch( PITCH_DONTKNOW ); aCreateFont.SetWeight( WEIGHT_DONTKNOW ); - aCreateFont.SetTransparent( sal_True ); + aCreateFont.SetTransparent( true ); aFmt.SetBulletFont( &aCreateFont ); } }else diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 4a60f58e6787..37b7a4ad151b 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -400,7 +400,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxDDHandler, ToolBox*, pToolBox) const OUString aCommand(pToolBox->GetItemCommand(nId)); EndTracking(); - pToolBox->SetItemDown( nId, sal_True ); + pToolBox->SetItemDown( nId, true ); if (aCommand == UNO_DEFAULTBULLET) { @@ -412,7 +412,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxDDHandler, ToolBox*, pToolBox) maNumberingPopup.UpdateValueSet(); maNumberingPopup.Show(*pToolBox); } - pToolBox->SetItemDown( nId, sal_False ); + pToolBox->SetItemDown( nId, false ); return 0; } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 5d3c74f664ff..5d317f1b19d1 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -61,7 +61,7 @@ static Font& lcl_GetDefaultBulletFont() aDefBulletFont.SetFamily( FAMILY_DONTKNOW ); aDefBulletFont.SetPitch( PITCH_DONTKNOW ); aDefBulletFont.SetWeight( WEIGHT_DONTKNOW ); - aDefBulletFont.SetTransparent( sal_True ); + aDefBulletFont.SetTransparent( true ); bInit = sal_True; } return aDefBulletFont; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 6494c69c9fe0..3a34edeab79c 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -72,7 +72,7 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ) for ( sal_uInt16 nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 ) if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) ) - EnableItem( aTable[nPos+1], sal_False ); + EnableItem( aTable[nPos+1], false ); } // ----------------------------------------------------------------------- diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index a0fe5a79ef9f..1367c0b110ea 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -90,8 +90,8 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion) // MapModes off sal_Bool bMapModeWasEnabledDest(mrOutputDevice.IsMapModeEnabled()); sal_Bool bMapModeWasEnabledSource(maPreRenderDevice.IsMapModeEnabled()); - mrOutputDevice.EnableMapMode(sal_False); - maPreRenderDevice.EnableMapMode(sal_False); + mrOutputDevice.EnableMapMode(false); + maPreRenderDevice.EnableMapMode(false); RectangleVector aRectangles; aRegionPixel.GetRegionRectangles(aRectangles); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 154316a20198..73193f646456 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -415,7 +415,7 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const aOuterPix.Bottom()+=nPixSiz; bool bMerk(pWin->IsMapModeEnabled()); - pWin->EnableMapMode(sal_False); + pWin->EnableMapMode(false); pWin->Invalidate(aOuterPix); pWin->EnableMapMode(bMerk); } diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 34c88c71fb63..4a95b145f7f4 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -240,7 +240,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const bool bMapMerk=rWin.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); aPt=rWin.LogicToPixel(aPt); - rWin.EnableMapMode(sal_False); + rWin.EnableMapMode(false); Size aSiz( aGlueHalfSize ); Rectangle aRect(aPt.X()-aSiz.Width(),aPt.Y()-aSiz.Height(), diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 21b8911f6d1c..59861fd8c16c 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -871,7 +871,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pMtf = NULL; if(pMtf) - pMtf->Pause(sal_True); + pMtf->Pause(true); Font aFontMerk(pOut->GetFont()); Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) ); @@ -885,7 +885,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pOut->SetFont(aFontMerk); if(pMtf) - pMtf->Pause(sal_False); + pMtf->Pause(false); bNoStretching = (aSize1 == aSize2); @@ -1851,7 +1851,7 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( // create the MetaFile pRetval = new GDIMetaFile; VirtualDevice aBlackHole; - aBlackHole.EnableOutput(sal_False); + aBlackHole.EnableOutput(false); pRetval->Record(&aBlackHole); Point aPaintPos = aPaintRect.TopLeft(); diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 9c6d7ff95153..d62f4c685ada 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -646,7 +646,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pModel->GetScaleFraction(), pModel->GetScaleFraction() ); - aOut.EnableOutput( sal_False ); + aOut.EnableOutput( false ); aOut.SetMapMode( aMap ); aMtf.Record( &aOut ); pObj->SingleObjectPainter( aOut ); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index cf1475d376ba..f9a92b0bc8c8 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1237,7 +1237,7 @@ bool SvxTableController::checkTableObject() sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* /*pWindow*/ ) { const bool bMod1 = rKEvt.GetKeyCode().IsMod1(); // ctrl - const bool bMod2 = rKEvt.GetKeyCode().IsMod2() != 0; // Alt + const bool bMod2 = rKEvt.GetKeyCode().IsMod2(); // Alt const bool bTextEdit = mpView->IsTextEdit(); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 0b6836483e14..cdad609a676a 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -48,7 +48,7 @@ private: protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); public: SvxColorWindow_Impl( const OUString& rCommand, diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 0e37a6d456d5..cce884f49765 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -396,13 +396,13 @@ void SvxColorDockingWindow::SetSize() |* \************************************************************************/ -sal_Bool SvxColorDockingWindow::Close() +bool SvxColorDockingWindow::Close() { SfxBoolItem aItem( SID_COLOR_CONTROL, false ); GetBindings().GetDispatcher()->Execute( SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); - return( sal_True ); + return true; } /************************************************************************* diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index fda4261b3667..01b221c05155 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -666,7 +666,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) nCurPos = GetSelectEntryPos(); else if ( EVENT_LOSEFOCUS == nType && Application::GetFocusWindow() - && !IsWindowOrChild( Application::GetFocusWindow(), sal_True ) ) + && !IsWindowOrChild( Application::GetFocusWindow(), true ) ) { if ( !bSelect ) SelectEntryPos( nCurPos ); diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 8d17b8dcb537..07898e1023f5 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -140,7 +140,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri Font aFont = GetFont(); aFont.SetColor( ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ) ); aFont.SetFillColor( aBackgroundColor ); - aFont.SetTransparent( sal_False ); + aFont.SetTransparent( false ); SetFont( aFont ); SetText( rText ); @@ -460,7 +460,7 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri Font aFont( GetFont() ); aFont.SetColor( aLineColor ); aFont.SetFillColor( aFaceColor ); - aFont.SetTransparent( sal_False ); + aFont.SetTransparent( false ); SetFont( aFont ); nCol = 0; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index f9deeb7ce8de..aa44b89d9afd 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -97,7 +97,7 @@ SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString DBG_ASSERT( nSlotId == GetId(), "id mismatch" ); pListBox = new ListBox( this, SVX_RES( LB_SVXTBX_UNDO_REDO_CTRL ) ); FreeResource(); - pListBox->EnableMultiSelection( sal_True, sal_True ); + pListBox->EnableMultiSelection( true, true ); SetBackground( GetSettings().GetStyleSettings().GetDialogColor() ); AddStatusListener( rCommandURL ); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index a1f112f4cddb..451e451eb2cc 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -510,7 +510,7 @@ void SvxLineEndWindow::FillValueSet() OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); aBmpSize = aBmp.GetSizePixel(); - aVD.SetOutputSizePixel( aBmpSize, sal_False ); + aVD.SetOutputSizePixel( aBmpSize, false ); aBmpSize.Width() = aBmpSize.Width() / 2; Point aPt0( 0, 0 ); Point aPt1( aBmpSize.Width(), 0 ); @@ -623,7 +623,7 @@ void SvxLineEndWindow::StartSelection() // ----------------------------------------------------------------------- -sal_Bool SvxLineEndWindow::Close() +bool SvxLineEndWindow::Close() { return SfxPopupWindow::Close(); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 7990834ab244..b46c61c9d4fa 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -266,7 +266,7 @@ private: protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual Window* GetPreferredKeyInputWindow(); virtual void GetFocus(); @@ -294,7 +294,7 @@ private: protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual Window* GetPreferredKeyInputWindow(); virtual void GetFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -351,7 +351,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(Window* pParent, , bInSpecialMode( bInSpec ) { aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT ); - EnableAutocomplete( sal_True ); + EnableAutocomplete( true ); EnableUserDraw( true ); SetUserItemSize( Size( 0, 30 ) ); } @@ -1232,7 +1232,7 @@ void SvxColorWindow_Impl::StartSelection() // ----------------------------------------------------------------------- -sal_Bool SvxColorWindow_Impl::Close() +bool SvxColorWindow_Impl::Close() { return SfxPopupWindow::Close(); } @@ -1537,7 +1537,7 @@ void SvxFrameWindow_Impl::StartSelection() // ----------------------------------------------------------------------- -sal_Bool SvxFrameWindow_Impl::Close() +bool SvxFrameWindow_Impl::Close() { return SfxPopupWindow::Close(); } @@ -1652,7 +1652,7 @@ void SvxLineWindow_Impl::Resize() // ----------------------------------------------------------------------- -sal_Bool SvxLineWindow_Impl::Close() +bool SvxLineWindow_Impl::Close() { return SfxPopupWindow::Close(); } @@ -1991,7 +1991,7 @@ void SvxStyleToolBoxControl::FillStyleBox() if ( bDoFill ) { - pBox->SetUpdateMode( sal_False ); + pBox->SetUpdateMode( false ); pBox->Clear(); { @@ -2059,7 +2059,7 @@ void SvxStyleToolBoxControl::FillStyleBox() pBox->SetStyle( nWinBits ); } - pBox->SetUpdateMode( sal_True ); + pBox->SetUpdateMode( true ); pBox->SetFamily( eFamily ); sal_uInt16 nLines = std::min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES ); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 04b141e4914b..98cbbe0cdf28 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -134,7 +134,7 @@ FindTextFieldControl::FindTextFieldControl( Window* pParent, WinBits nStyle, m_xContext(xContext) { SetPlaceholderText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND)); - EnableAutocomplete(sal_True, sal_True); + EnableAutocomplete(true, true); } FindTextFieldControl::~FindTextFieldControl() diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 3f67ed42dc2d..8b03ad6d01e7 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -729,7 +729,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, aVDev.SetMapMode( aMap ); if( rSettings.mbUseHighContrast ) aVDev.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); - aVDev.EnableOutput( sal_False ); + aVDev.EnableOutput( false ); aMtf.Record( &aVDev ); Size aNewSize; @@ -927,7 +927,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, } } - aOut.EnableOutput( sal_False ); + aOut.EnableOutput( false ); aOut.SetMapMode( aMap ); if( rSettings.mbUseHighContrast ) aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); |