diff options
Diffstat (limited to 'sd')
48 files changed, 117 insertions, 117 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index eb5f338c5f76..52107528eaa5 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1154,10 +1154,10 @@ Font SdStyleSheetPool::GetBulletFont() const aBulletFont.SetOverline(UNDERLINE_NONE); aBulletFont.SetStrikeout(STRIKEOUT_NONE); aBulletFont.SetItalic(ITALIC_NONE); - aBulletFont.SetOutline(sal_False); - aBulletFont.SetShadow(sal_False); + aBulletFont.SetOutline(false); + aBulletFont.SetShadow(false); aBulletFont.SetColor(Color(COL_AUTO)); - aBulletFont.SetTransparent(sal_True); + aBulletFont.SetTransparent(true); return aBulletFont; } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index fdb812e92b9d..ffbba781393e 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -724,8 +724,8 @@ void SdPublishingDlg::SetDefaults() SdPublishingDesign aDefault; SetDesign(&aDefault); - pPage1_NewDesign->Check(sal_True); - pPage1_OldDesign->Check(sal_False); + pPage1_NewDesign->Check(true); + pPage1_OldDesign->Check(false); UpdatePage(); } @@ -905,8 +905,8 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) { if(pButton == pPage1_NewDesign) { - pPage1_NewDesign->Check(sal_True); // because of DesignDeleteHdl - pPage1_OldDesign->Check(sal_False); + pPage1_NewDesign->Check(true); // because of DesignDeleteHdl + pPage1_OldDesign->Check(false); pPage1_Designs->Disable(); pPage1_DelDesign->Disable(); m_pDesign = NULL; @@ -916,7 +916,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) } else { - pPage1_NewDesign->Check(sal_False); + pPage1_NewDesign->Check(false); pPage1_Designs->Enable(); pPage1_DelDesign->Enable(); @@ -1038,7 +1038,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton ) IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl) { // if one bitmap-button is chosen, then disable TextOnly - pPage5_TextOnly->Check(sal_False); + pPage5_TextOnly->Check(false); return 0; } @@ -1078,7 +1078,7 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton) m_aALinkColor = aDlg.GetColor(); } - pPage6_User->Check(sal_True); + pPage6_User->Check(true); pPage6_Preview->SetColors( m_aBackColor, m_aTextColor, m_aLinkColor, m_aVLinkColor, m_aALinkColor ); pPage6_Preview->Invalidate(); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index fcc0c17bf50c..cb838dbc3f28 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -92,7 +92,7 @@ private: CategoryListBox::CategoryListBox( Window* pParent ) : ListBox( pParent, WB_TABSTOP | WB_BORDER ) { - EnableUserDraw( sal_True ); + EnableUserDraw( true ); SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); } @@ -142,7 +142,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) } else { - DrawEntry( rUDEvt, sal_True, sal_True ); + DrawEntry( rUDEvt, true, true ); } } diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index ee6763c7eda7..60135d8b0ad4 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1195,7 +1195,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con if ( !pColorList.is() ) pColorList = XColorList::CreateStdColorList(); - mpCLBDimColor->SetUpdateMode( sal_False ); + mpCLBDimColor->SetUpdateMode( false ); for ( long i = 0; i < pColorList->Count(); i++ ) { @@ -1203,7 +1203,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con mpCLBDimColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - mpCLBDimColor->SetUpdateMode( sal_True ); + mpCLBDimColor->SetUpdateMode( true ); // only show settings if all selected effects have the same preset-id if( pSet->getPropertyState( nHandlePresetId ) != STLPropertyState_AMBIGUOUS ) @@ -1658,7 +1658,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() OUString aStrWarning(SD_RESSTR(STR_WARNING_NOSOUNDFILE)); aStrWarning = aStrWarning.replaceFirst("%", aFile); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); - aWarningBox.SetModalInputMode (sal_True); + aWarningBox.SetModalInputMode (true); bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True; bValidSoundFile=false; @@ -1900,8 +1900,8 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl ) { if( pControl == mpLBTrigger ) { - mpRBClickSequence->Check( sal_False ); - mpRBInteractive->Check( sal_True ); + mpRBClickSequence->Check( false ); + mpRBInteractive->Check( true ); } return 0; @@ -2234,7 +2234,7 @@ void CustomAnimationTextAnimTabPage::updateControlStates() if( !mbHasVisibleShapes && nPos > 0 ) { - maCBXAnimateForm->Check(sal_False); + maCBXAnimateForm->Check(false); maCBXAnimateForm->Enable(false); } else diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 958b86d17532..677ddd7f2587 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -662,8 +662,8 @@ void SlideTransitionPane::updateControls() if( aEffect.mbPresChangeAmbiguous ) { - mpRB_ADVANCE_ON_MOUSE->Check( sal_False ); - mpRB_ADVANCE_AUTO->Check( sal_False ); + mpRB_ADVANCE_ON_MOUSE->Check( false ); + mpRB_ADVANCE_AUTO->Check( false ); } else { @@ -749,7 +749,7 @@ void SlideTransitionPane::openSoundFileDialog() OUString aStrWarning(SD_RESSTR(STR_WARNING_NOSOUNDFILE)); aStrWarning = aStrWarning.replaceFirst("%", aFile); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); - aWarningBox.SetModalInputMode (sal_True); + aWarningBox.SetModalInputMode (true); bQuitLoop = (aWarningBox.Execute() != RET_RETRY); bValidSoundFile = false; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index ec998abda243..3da2764a151b 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -989,11 +989,11 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation { if( pAnnotationWindow->IsProtected() || bReadOnly ) { - pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, sal_False ); - pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, sal_False ); - pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, sal_False ); - pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, sal_False ); - pMenu->EnableItem( SID_PASTE, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, false ); + pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, false ); + pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, false ); + pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, false ); + pMenu->EnableItem( SID_PASTE, false ); } else { diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index d25d45ce0c62..857ff1a09bb6 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -598,7 +598,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected ) const int BORDER_Y = 4; // pixels maSize = Size( aVDev.GetTextWidth( sAuthor ) + 2*BORDER_X, aVDev.GetTextHeight() + 2*BORDER_Y ); - aVDev.SetOutputSizePixel( maSize, sal_False ); + aVDev.SetOutputSizePixel( maSize, false ); Color aBorderColor( maColor ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 412ca0cce32c..ee1ab02d015b 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -328,7 +328,7 @@ void AnnotationWindow::InitControls() mpOutliner->SetRefDevice( pDev ); } - mpTextWindow->EnableRTL( sal_False ); + mpTextWindow->EnableRTL( false ); mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow ); mpOutliner->InsertView(mpOutlinerView ); mpTextWindow->SetOutlinerView(mpOutlinerView); diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 8a8204526801..5669e44a9c16 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -144,7 +144,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, if( nImage == 0 ) { if( rTbx.IsItemChecked( nSId ) ) - rTbx.CheckItem( nSId, sal_False ); + rTbx.CheckItem( nSId, false ); } else { @@ -168,28 +168,28 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, { if( nSId != SID_OBJECT_CHOOSE_MODE && rTbx.IsItemChecked( SID_OBJECT_CHOOSE_MODE ) ) - rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, sal_False ); + rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, false ); if( nSId != SID_DRAWTBX_TEXT && rTbx.IsItemChecked( SID_DRAWTBX_TEXT ) ) - rTbx.CheckItem( SID_DRAWTBX_TEXT, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_TEXT, false ); if( nSId != SID_DRAWTBX_RECTANGLES && rTbx.IsItemChecked( SID_DRAWTBX_RECTANGLES ) ) - rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, false ); if( nSId != SID_DRAWTBX_ELLIPSES && rTbx.IsItemChecked( SID_DRAWTBX_ELLIPSES ) ) - rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, false ); if( nSId != SID_DRAWTBX_LINES && rTbx.IsItemChecked( SID_DRAWTBX_LINES ) ) - rTbx.CheckItem( SID_DRAWTBX_LINES, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_LINES, false ); if( nSId != SID_DRAWTBX_ARROWS && rTbx.IsItemChecked( SID_DRAWTBX_ARROWS ) ) - rTbx.CheckItem( SID_DRAWTBX_ARROWS, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_ARROWS, false ); if( nSId != SID_DRAWTBX_3D_OBJECTS && rTbx.IsItemChecked( SID_DRAWTBX_3D_OBJECTS ) ) - rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, false ); if( nSId != SID_DRAWTBX_CONNECTORS && rTbx.IsItemChecked( SID_DRAWTBX_CONNECTORS ) ) - rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, sal_False ); + rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, false ); } } } diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index 552a59207e65..0e43d289f574 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -76,7 +76,7 @@ LayerDialogContent::~LayerDialogContent (void) -sal_Bool LayerDialogContent::Close (void) +bool LayerDialogContent::Close (void) { return SfxDockingWindow::Close(); } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 79f23a01980d..b81471c1c584 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -811,11 +811,11 @@ void AnimationWindow::Resize() // ----------------------------------------------------------------------- -sal_Bool AnimationWindow::Close() +bool AnimationWindow::Close() { if( maPlayLock.isLocked() ) { - return sal_False; + return false; } else { @@ -826,7 +826,7 @@ sal_Bool AnimationWindow::Close() SfxDockingWindow::Close(); - return sal_True; + return true; } } @@ -1132,7 +1132,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) aAnimBmp.aSizePix = aBitmapSize; aAnimBmp.nWait = nTime; aAnimBmp.eDisposal = DISPOSE_BACK; - aAnimBmp.bUserInput = sal_False; + aAnimBmp.bUserInput = false; aAnimation.Insert( aAnimBmp ); aAnimation.SetDisplaySizePixel( aMaxSizePix ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index d047cb06fad6..049924b63e7b 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -304,7 +304,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, // Hack: m_pLbPages used to be MultiLB. We don't have VCL builder equivalent // of it yet. So enable selecting multiple items here - m_pLbPages->EnableMultiSelection( sal_True ); + m_pLbPages->EnableMultiSelection( true ); // shape 'em a bit m_pLbPages->set_width_request(m_pLbPages->approximate_char_width() * 16); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index a6f667427beb..ef79fdb83a6b 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -430,8 +430,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpPage1OpenPB->SetModeImage( GetUiIconForCommand(".uno:Open") ); - mpPage1OpenPB->EnableImageDisplay(sal_True); - mpPage1OpenPB->EnableTextDisplay(sal_True); + mpPage1OpenPB->EnableImageDisplay(true); + mpPage1OpenPB->EnableTextDisplay(true); mpPage1OpenPB->SetImageAlign(IMAGEALIGN_LEFT); mpPage1OpenPB->SetStyle(mpPage1OpenPB->GetStyle() | WB_CENTER); } diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 6a93c8d11606..3d42a5272d7c 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -227,7 +227,7 @@ void SdDocPreviewWin::updateViewSettings() aVDev.SetMapMode( aMap ); // Disable output, as we only want to record a metafile - aVDev.EnableOutput( sal_False ); + aVDev.EnableOutput( false ); pMtf->Record( &aVDev ); diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index 109fb757ebf3..acf843651910 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -25,7 +25,7 @@ SdInsertPasteDlg::SdInsertPasteDlg(Window* pWindow) { get(m_pRbBefore, "before"); get(m_pRbAfter, "after"); - m_pRbAfter->Check( sal_True ); + m_pRbAfter->Check( true ); } bool SdInsertPasteDlg::IsInsertBefore() const diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 1c1ed12d9cc2..b400ca9d68cc 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -80,7 +80,7 @@ void SdInsertPagesObjsDlg::Reset() m_pLbTree->InsertEntry( rName, aImgText, aImgText ); } - m_pCbxMasters->Check( sal_True ); + m_pCbxMasters->Check( true ); } std::vector<OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 1950ddb0d6b1..71781cbe8425 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -350,8 +350,8 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) if( ( pInfo && !pInfo->HasName() ) || !maTlbObjects.IsLinkableSelected() ) { - pMenu->EnableItem( NAVIGATOR_DRAGTYPE_LINK, sal_False ); - pMenu->EnableItem( NAVIGATOR_DRAGTYPE_URL, sal_False ); + pMenu->EnableItem( NAVIGATOR_DRAGTYPE_LINK, false ); + pMenu->EnableItem( NAVIGATOR_DRAGTYPE_URL, false ); meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED; } @@ -912,7 +912,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, pNavigatorWin->maToolbox.CheckItem( TBI_PEN ); if( nState & NAVBTN_PEN_UNCHECKED && pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) ) - pNavigatorWin->maToolbox.CheckItem( TBI_PEN, sal_False ); + pNavigatorWin->maToolbox.CheckItem( TBI_PEN, false ); // only if doc in LB is the active NavDocInfo* pInfo = pNavigatorWin->GetDocInfo(); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 296961974343..689fec1cf7e0 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -115,7 +115,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) { const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(ATTR_NUMBER_NEWSTART); m_pNewStartCB->SetState( rStart.GetValue() ? STATE_CHECK : STATE_NOCHECK ); - m_pNewStartCB->EnableTriState(sal_False); + m_pNewStartCB->EnableTriState(false); } else { @@ -133,7 +133,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) nNewStart = 1; m_pNewStartNF->SetValue(nNewStart); - m_pNewStartNumberCB->EnableTriState(sal_False); + m_pNewStartNumberCB->EnableTriState(false); } else { diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index eb4f671bab9c..b7c14fefc02d 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -137,11 +137,11 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxAutoLogo->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() ); if( bWindow ) - aRbtWindow->Check( sal_True ); + aRbtWindow->Check( true ); else if( bEndless ) - aRbtAuto->Check( sal_True ); + aRbtAuto->Check( true ); else - aRbtStandard->Check( sal_True ); + aRbtStandard->Check( true ); InitMonitorSettings(); @@ -317,7 +317,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) if( bWindow ) { aCbxAlwaysOnTop->Enable( false ); - aCbxAlwaysOnTop->Check( sal_False ); + aCbxAlwaysOnTop->Check( false ); } else aCbxAlwaysOnTop->Enable(); diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index 0fc9320534e1..cc57f68fc360 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -43,7 +43,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True)); + static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", true)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) fp = ( SdAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" ); diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index bfa60140132e..c7bd85c4ad89 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -74,7 +74,7 @@ void SdPresLayoutDlg::Reset() } // remove not used master pages - m_pCbxCheckMasters->Check(sal_False); + m_pCbxCheckMasters->Check(false); if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, true, &pPoolItem) == SFX_ITEM_SET) maName = ((const SfxStringItem*)pPoolItem)->GetValue(); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index bd159e99555b..7ad6dc631ae2 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -240,8 +240,8 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, if( aRect.Bottom() > ( rMaxSize.Height() - 1L ) ) aRect.Bottom() = rMaxSize.Height() - 1L; - rMtf.AddAction( new MetaLineColorAction( aColor, sal_True ) ); - rMtf.AddAction( new MetaFillColorAction( aColor, sal_True ) ); + rMtf.AddAction( new MetaLineColorAction( aColor, true ) ); + rMtf.AddAction( new MetaFillColorAction( aColor, true ) ); rMtf.AddAction( new MetaRectAction( aRect ) ); } diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 281c4650b5d5..abe7232bbf26 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -62,7 +62,7 @@ FullScreenPane::FullScreenPane ( return; // Create a new top-leve window that is displayed full screen. - mpWorkWindow->ShowFullScreenMode(sal_True, nScreenNumber); + mpWorkWindow->ShowFullScreenMode(true, nScreenNumber); // For debugging (non-fullscreen) use mpWorkWindow->SetScreenNumber(nScreenNumber); mpWorkWindow->SetMenuBarMode(MENUBAR_MODE_HIDE); mpWorkWindow->SetBorderStyle(WINDOW_BORDER_REMOVEBORDER); @@ -167,7 +167,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessibl ThrowIfDisposed(); if (mpWorkWindow != 0) - return mpWorkWindow->GetAccessible(sal_False); + return mpWorkWindow->GetAccessible(false); else return NULL; } diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 30bcaa0f9c9f..42cb84cfc84d 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -149,7 +149,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) ThrowIfDisposed(); ::Window* pWindow = GetWindow(); if (pWindow != NULL) - return pWindow->GetAccessible(sal_False); + return pWindow->GetAccessible(false); else return NULL; } diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 4e1d9ef2779e..3a9331528a70 100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -41,7 +41,7 @@ public: virtual ~LayerDialogContent (void); protected: - virtual sal_Bool Close (void); + virtual bool Close (void); virtual void Resize (void); private: diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 1a6a94551536..fc156511a50d 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -98,7 +98,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual sal_Bool Close(); + virtual bool Close(); virtual void Resize(); virtual void FillInfo( SfxChildWinInfo& ) const; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 52cce1468653..a8622a091b0a 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -129,7 +129,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( // Make the frame window transparent and make the parent able to // draw behind it. if (pParentWindow != NULL) - pParentWindow->EnableChildTransparentMode(sal_True); + pParentWindow->EnableChildTransparentMode(true); } if (pWindow != NULL) @@ -141,12 +141,12 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( if ( ! bEnableParentClip) { pWindow->SetParentClipMode(PARENTCLIPMODE_NOCLIP); - pWindow->SetPaintTransparent(sal_True); + pWindow->SetPaintTransparent(true); } else { pWindow->SetParentClipMode(PARENTCLIPMODE_CLIP); - pWindow->SetPaintTransparent(sal_False); + pWindow->SetPaintTransparent(false); } } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index ae8627ecf312..a8be21fed460 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -561,7 +561,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void delete mpOutputDevice; mpOutputDevice = new VirtualDevice(*Application::GetDefaultDevice(), 0, 0); mpOutputDevice->SetMapMode(MAP_PIXEL); - mpOutputDevice->SetOutputSizePixel(maSize, sal_True); + mpOutputDevice->SetOutputSizePixel(maSize, true); mpOutputDevice->SetLineColor(); mpOutputDevice->SetFillColor(); mpOutputDevice->SetBackground(Wallpaper()); diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 9fc151d163ec..b590a2b6214f 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -260,7 +260,7 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) if (mrDocument.GetMasterPageUserCount(GetSelectedMasterPage()) > 0) { if (rMenu.GetItemPos(SID_DELETE_MASTER_PAGE) != MENU_ITEM_NOTFOUND) - rMenu.EnableItem(SID_DELETE_MASTER_PAGE, sal_False); + rMenu.EnableItem(SID_DELETE_MASTER_PAGE, false); } ::boost::shared_ptr<DrawViewShell> pDrawViewShell ( @@ -269,7 +269,7 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) && pDrawViewShell->GetEditMode() == EM_MASTERPAGE) { if (rMenu.GetItemPos(SID_TP_EDIT_MASTER) != MENU_ITEM_NOTFOUND) - rMenu.EnableItem(SID_TP_EDIT_MASTER, sal_False); + rMenu.EnableItem(SID_TP_EDIT_MASTER, false); } MasterPagesSelector::ProcessPopupMenu(rMenu); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index d842e9df3b92..2cbeb8680e65 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -679,7 +679,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent) const SfxItemState aState ( mrBase.GetViewFrame()->GetDispatcher()->QueryState(SID_INSERTPAGE, pItem)); if (aState == SFX_ITEM_DISABLED) - pMenu->EnableItem(SID_INSERTPAGE_LAYOUT_MENU, sal_False); + pMenu->EnableItem(SID_INSERTPAGE_LAYOUT_MENU, false); // Show the menu. pMenu->Execute(this, Rectangle(aMenuPosition,Size(1,1)), POPUPMENU_EXECUTE_DOWN); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index cf79711aa856..ded2f3a028a8 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -292,9 +292,9 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu) { // Disable some entries. if (mpContainer->GetPreviewSize() == MasterPageContainer::SMALL) - rMenu.EnableItem(SID_TP_SHOW_SMALL_PREVIEW, sal_False); + rMenu.EnableItem(SID_TP_SHOW_SMALL_PREVIEW, false); else - rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, sal_False); + rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false); } diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 6bf653058c87..0e1a423ea17f 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -165,7 +165,7 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList ( void RecentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) { if (rMenu.GetItemPos(SID_TP_EDIT_MASTER) != MENU_ITEM_NOTFOUND) - rMenu.EnableItem(SID_TP_EDIT_MASTER, sal_False); + rMenu.EnableItem(SID_TP_EDIT_MASTER, false); } diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index bfd795bd0e4e..2093c96a27e7 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -60,7 +60,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: // Do never mirror the preview window. This explicitly includes right // to left writing environments. - EnableRTL (sal_False); + EnableRTL (false); MapMode aMap(GetMapMode()); aMap.SetMapUnit(MAP_100TH_MM); @@ -197,7 +197,7 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) sal_uLong nTime = Time::GetSystemTicks(); if( (nTime - mnFirstMouseMove) >= SHOW_MOUSE_TIMEOUT ) { - ShowPointer( sal_True ); + ShowPointer( true ); mnFirstMouseMove = 0; mbMouseCursorHidden = false; maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT ); @@ -614,7 +614,7 @@ IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl) else { // mouse has been idle to long, hide pointer - ShowPointer( sal_False ); + ShowPointer( false ); mbMouseCursorHidden = true; } return 0L; @@ -663,7 +663,7 @@ void ShowWindow::AddWindowToPaintView() ::com::sun::star::accessibility::XAccessible> ShowWindow::CreateAccessible (void) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(sal_False); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) { return xAcc; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 8453275cd097..6795f92e8fb4 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -718,7 +718,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent()); if( pWorkWindow ) { - pWorkWindow->StartPresentationMode( sal_False, isAlwaysOnTop() ? PRESENTATION_HIDEALLAPPS : 0 ); + pWorkWindow->StartPresentationMode( false, isAlwaysOnTop() ? PRESENTATION_HIDEALLAPPS : 0 ); } } } @@ -1237,7 +1237,7 @@ void SlideShow::StartFullscreenPresentation( ) const sal_Int32 nDisplay (GetDisplay()); WorkWindow* pWorkWindow = new FullScreenWorkWindow(this, mpCurrentViewShellBase); pWorkWindow->SetBackground(Wallpaper(COL_BLACK)); - pWorkWindow->StartPresentationMode( sal_True, mpDoc->getPresentationSettings().mbAlwaysOnTop ? PRESENTATION_HIDEALLAPPS : 0, nDisplay); + pWorkWindow->StartPresentationMode( true, mpDoc->getPresentationSettings().mbAlwaysOnTop ? PRESENTATION_HIDEALLAPPS : 0, nDisplay); // pWorkWindow->ShowFullScreenMode(sal_False, nDisplay); if (pWorkWindow->IsVisible()) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index be0c76628829..d04c43228261 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2204,7 +2204,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) const sal_Int32 nPageNumberCount = mpSlideController->getSlideNumberCount(); if( nPageNumberCount <= 1 ) { - pMenu->EnableItem( CM_GOTO, sal_False ); + pMenu->EnableItem( CM_GOTO, false ); } else { @@ -2274,7 +2274,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) break; } - pWidthMenu->EnableItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator), sal_True); + pWidthMenu->EnableItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator), true); if( nWidth == mdUserPaintStrokeWidth) pWidthMenu->CheckItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator) ); } diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 265ffac5673a..8f1542ae7498 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -982,7 +982,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString& return; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - xAccessible (pWindow->GetAccessible(sal_False)); + xAccessible (pWindow->GetAccessible(false)); if ( ! xAccessible.is()) return; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 5dacf9fd87f3..9e9c189aa6ee 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -491,11 +491,11 @@ void SlideSorter::ArrangeGUIElements ( // Prevent untimely redraws while the view is not yet correctly // resized. view::SlideSorterView::DrawLock aLock (*this); - GetContentWindow()->EnablePaint (sal_False); + GetContentWindow()->EnablePaint (false); mpSlideSorterController->Resize (Rectangle(aOrigin, rSize)); - GetContentWindow()->EnablePaint (sal_True); + GetContentWindow()->EnablePaint (true); mbLayoutPending = false; } diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 397d45b08e91..c38951c4856a 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -149,13 +149,13 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert { case Font_PageNumber: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(sal_True); + pFont->SetTransparent(true); pFont->SetWeight(WEIGHT_BOLD); break; case Font_PageCount: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(sal_True); + pFont->SetTransparent(true); pFont->SetWeight(WEIGHT_NORMAL); { const Size aSize (pFont->GetSize()); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index de318e410411..0810b0374dd1 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -201,12 +201,12 @@ Image PreviewRenderer::RenderSubstitution ( const Rectangle aPaintRectangle ( Point(0,0), mpPreviewDevice->GetOutputSizePixel()); - mpPreviewDevice->EnableMapMode(sal_False); + mpPreviewDevice->EnableMapMode(false); mpPreviewDevice->SetLineColor(); svtools::ColorConfig aColorConfig; mpPreviewDevice->SetFillColor(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor); mpPreviewDevice->DrawRect (aPaintRectangle); - mpPreviewDevice->EnableMapMode(sal_True); + mpPreviewDevice->EnableMapMode(true); // Paint substitution text and a frame around it. PaintSubstitutionText (rSubstitutionText); @@ -393,11 +393,11 @@ void PreviewRenderer::PaintFrame (void) Rectangle aPaintRectangle ( Point(0,0), mpPreviewDevice->GetOutputSizePixel()); - mpPreviewDevice->EnableMapMode(sal_False); + mpPreviewDevice->EnableMapMode(false); mpPreviewDevice->SetLineColor(maFrameColor); mpPreviewDevice->SetFillColor(); mpPreviewDevice->DrawRect(aPaintRectangle); - mpPreviewDevice->EnableMapMode(sal_True); + mpPreviewDevice->EnableMapMode(true); } } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 3acd004ae46f..42cca8620c0d 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1083,7 +1083,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { Point aPoint; Size aSize( GetPage()->GetSize() ); - pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, sal_True ), 0 ); + pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, true ), 0 ); pMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); pMetaFile->SetPrefMapMode( MAP_100TH_MM ); pMetaFile->SetPrefSize( aSize ); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 25341b1c636e..50afc78a77e1 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -425,7 +425,7 @@ namespace { ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" ; - vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, sal_True ); + vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, true ); AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt( "slidesperpageorder", SD_RESSTR(_STR_IMPRESS_PRINT_UI_ORDER), @@ -448,7 +448,7 @@ namespace { SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME), ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" , "IsPrintName" , - sal_False + false ) ); } @@ -458,7 +458,7 @@ namespace { SD_RESSTR(_STR_DRAW_PRINT_UI_IS_PRINT_NAME), ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" , "IsPrintName" , - sal_False + false ) ); } @@ -467,7 +467,7 @@ namespace { SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE), ".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" , "IsPrintDateTime" , - sal_False + false ) ); @@ -477,7 +477,7 @@ namespace { SD_RESSTR(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN), ".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" , "IsPrintHidden" , - sal_False + false ) ); } @@ -558,13 +558,13 @@ namespace { SD_RESSTR(_STR_IMPRESS_PRINT_UI_BROCHURE), ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" , "PrintProspect" , - sal_False, + false, aBrochureOpt ) ); vcl::PrinterOptionsHelper::UIControlOptions - aIncludeOpt( "PrintProspect" , -1, sal_False ); + aIncludeOpt( "PrintProspect" , -1, false ); aIncludeOpt.maGroupHint = "LayoutPage" ; aHelpIds.realloc( 1 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ; @@ -587,13 +587,13 @@ namespace { SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAPER_TRAY), ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" , "PrintPaperFromSetup" , - sal_False, + false, aPaperTrayOpt ) ); // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.mbInternalOnly = sal_True; + aPrintRangeOpt.mbInternalOnly = true; aPrintRangeOpt.maGroupHint = "PrintRange" ; AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("printrange", SD_RESSTR(_STR_IMPRESS_PRINT_UI_PAGE_RANGE), @@ -620,7 +620,7 @@ namespace { 0 ) ); // create a an Edit dependent on "Pages" selected - vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); + vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, true ); AddDialogControl(vcl::PrinterOptionsHelper::setEditControlOpt("pagerange", "", ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange", OUString::number(mnCurPage + 1), aPageRangeOpt)); diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index faafb29a74b4..a34406f0a9d9 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1713,13 +1713,13 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) if (pChildWindow != NULL) pSearchDialog = pChildWindow->GetWindow(); if (pSearchDialog != NULL) - pSearchDialog->EnableInput(false,sal_True); + pSearchDialog->EnableInput(false,true); sal_uInt16 nResult = rMessageBox.Execute(); // Unlock the search dialog. if (pSearchDialog != NULL) - pSearchDialog->EnableInput(true,sal_True); + pSearchDialog->EnableInput(true,true); return nResult; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 91a694e60380..c585ca44bb5d 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1212,7 +1212,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) void ViewShellBase::Implementation::ShowViewTabBar (bool bShow) { if (mpViewTabBar.is() - && (mpViewTabBar->GetTabControl()->IsVisible()==sal_True) != bShow) + && mpViewTabBar->GetTabControl()->IsVisible() != bShow) { mpViewTabBar->GetTabControl()->Show(bShow ? sal_True : sal_False); mrBase.Rearrange(); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 24b89fa2f968..21a8b4fb04b1 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -914,7 +914,7 @@ void DrawViewShell::ShowSnapLineContextMenu ( SD_RESSTR(STR_POPUP_DELETE_SNAPLINE)); } - pMenu->RemoveDisabledEntries(sal_False, sal_False); + pMenu->RemoveDisabledEntries(false, false); const sal_uInt16 nResult = pMenu->Execute( GetActiveWindow(), diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 5589cf7e83e0..a12427f8bd03 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -151,8 +151,8 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh maBulletFont.SetUnderline(UNDERLINE_NONE); maBulletFont.SetStrikeout(STRIKEOUT_NONE); maBulletFont.SetItalic(ITALIC_NONE); - maBulletFont.SetOutline(sal_False); - maBulletFont.SetShadow(sal_False); + maBulletFont.SetOutline(false); + maBulletFont.SetShadow(false); Reference<XFrame> xFrame (mrOutlineViewShell.GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 8af9d12a5506..a23c31c840be 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -91,7 +91,7 @@ Window::Window(::Window* pParent) SetUniqueId(HID_SD_WIN_DOCUMENT); // #i78183# Added after discussed with AF - EnableRTL(sal_False); + EnableRTL(false); } @@ -1039,7 +1039,7 @@ void Window::DropScroll(const Point& rMousePos) { return ::Window::CreateAccessible (); } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(sal_False); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) { return xAcc; @@ -1064,7 +1064,7 @@ void Window::SwitchView() { if (mpViewShell) { - mpViewShell->SwitchViewFireFocus(GetAccessible(sal_False)); + mpViewShell->SwitchViewFireFocus(GetAccessible(false)); } } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 70da4bea74d4..6eae63a9cf6e 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -390,7 +390,7 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) const Rectangle aRectSrc( Point( 0, 0 ), aSize ); aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge)); - aRet.Expand( aSize.Width(), aSize.Height(), NULL, sal_True ); + aRet.Expand( aSize.Width(), aSize.Height(), NULL, true ); aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) ); aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) ); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 030e56fb43c9..46f60850f70f 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -211,7 +211,7 @@ void ViewShell::construct(void) { // Create scroll bars and the filler between the scroll bars. mpHorizontalScrollBar.reset (new ScrollBar(GetParentWindow(), WinBits(WB_HSCROLL | WB_DRAG))); - mpHorizontalScrollBar->EnableRTL (sal_False); + mpHorizontalScrollBar->EnableRTL (false); mpHorizontalScrollBar->SetRange(Range(0, 32000)); mpHorizontalScrollBar->SetScrollHdl(LINK(this, ViewShell, HScrollHdl)); @@ -705,7 +705,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi rCEvt.IsMouseEvent(),(const void *) &aWheelData ); bDone = pWin->HandleScrollCommand( aReWrite, mpHorizontalScrollBar.get(), - mpVerticalScrollBar.get()) == sal_True; + mpVerticalScrollBar.get()); } } } @@ -1550,7 +1550,7 @@ void ViewShell::SwitchActiveViewFireFocus() { if (mpContentWindow) { - SwitchViewFireFocus(mpContentWindow->GetAccessible(sal_False)); + SwitchViewFireFocus(mpContentWindow->GetAccessible(false)); } } // move these two methods from DrawViewShell. |