diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:00:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:23 +0100 |
| commit | 608953c42590c3100eaa46ba686560403d1b8d03 (patch) | |
| tree | a0b706f6199e17174fc61b8948c5b63e8490ff72 /sd/source/ui | |
| parent | e7d1a81ee3befa9e9444fe5bf5c4ced9c98eecf5 (diff) | |
bool improvements
Change-Id: Icac34936bdb551ad517170fd497212513719d2aa
Diffstat (limited to 'sd/source/ui')
111 files changed, 543 insertions, 543 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 273e1a84014f..1d5815dfd0c9 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -866,7 +866,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() if( pDoc ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); - SdrLayer* aSdrLayer = rLayerAdmin.GetLayer(sDisplay, sal_False); + SdrLayer* aSdrLayer = rLayerAdmin.GetLayer(sDisplay, false); if( aSdrLayer ) { OUString layerAltText = aSdrLayer->GetTitle(); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 0e62b83713b4..7ee44ba28dae 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -77,7 +77,7 @@ struct XShapePosCompareHelper if(pObj1 && pObj2) return pObj1->GetOrdNum() < pObj2->GetOrdNum(); else - return 0; + return false; } }; //===== internal ============================================================ diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 86a7304ae568..ec3b3e60dba3 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -158,7 +158,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) } else { - mpControl->Enable( sal_False ); + mpControl->Enable( false ); } } } @@ -1334,10 +1334,10 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con } else { - mpFTTextAnim->Enable( sal_False ); - mpLBTextAnim->Enable( sal_False ); - mpMFTextDelay->Enable( sal_False ); - mpFTTextDelay->Enable( sal_False ); + mpFTTextAnim->Enable( false ); + mpLBTextAnim->Enable( false ); + mpMFTextDelay->Enable( false ); + mpFTTextDelay->Enable( false ); } @@ -2138,7 +2138,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, } else { - maCBXAnimateForm->Enable( sal_False ); + maCBXAnimateForm->Enable( false ); } maCBXReverse->SetState( STATE_DONTKNOW ); @@ -2233,11 +2233,11 @@ void CustomAnimationTextAnimTabPage::updateControlStates() if( !mbHasVisibleShapes && nPos > 0 ) { maCBXAnimateForm->Check(sal_False); - maCBXAnimateForm->Enable(sal_False); + maCBXAnimateForm->Enable(false); } else { - maCBXAnimateForm->Enable(sal_True); + maCBXAnimateForm->Enable(true); } } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 4bbcccb5f4a6..1529c2f429fa 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -669,7 +669,7 @@ void CustomAnimationList::update() if( xShape.is() ) { SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry; - pLBoxEntry->AddItem( new SvLBoxContextBmp( pLBoxEntry, 0, Image(), Image(), 0)); + pLBoxEntry->AddItem( new SvLBoxContextBmp( pLBoxEntry, 0, Image(), Image(), false)); OUString aDescription = SD_RESSTR(STR_CUSTOMANIMATION_TRIGGER); aDescription += ": "; aDescription += getShapeDescription( xShape, false ); @@ -779,7 +779,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) // create an entry for the effect SvTreeListEntry* pEntry = new CustomAnimationListEntry( pEffect ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new CustomAnimationListEntryItem( pEntry, 0, aDescription, pEffect, this ) ); if( pParentEntry ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 2897d2e54c5d..74eed98a448e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -469,14 +469,14 @@ void CustomAnimationPane::updateControls() if( !mxView.is() ) { - mpPBAddEffect->Enable( sal_False ); - mpPBChangeEffect->Enable( sal_False ); - mpPBRemoveEffect->Enable( sal_False ); - mpFTStart->Enable( sal_False ); - mpLBStart->Enable( sal_False ); - mpPBPropertyMore->Enable( sal_False ); - mpLBProperty->Enable( sal_False ); - mpFTProperty->Enable( sal_False ); + mpPBAddEffect->Enable( false ); + mpPBChangeEffect->Enable( false ); + mpPBRemoveEffect->Enable( false ); + mpFTStart->Enable( false ); + mpLBStart->Enable( false ); + mpPBPropertyMore->Enable( false ); + mpLBProperty->Enable( false ); + mpFTProperty->Enable( false ); mpCustomAnimationList->clear(); return; } @@ -552,9 +552,9 @@ void CustomAnimationPane::updateControls() else { mpLBProperty->setSubControl( 0 ); - mpFTProperty->Enable( sal_False ); - mpLBProperty->Enable( sal_False ); - mpPBPropertyMore->Enable( sal_False ); + mpFTProperty->Enable( false ); + mpLBProperty->Enable( false ); + mpPBPropertyMore->Enable( false ); } sal_uInt16 nPos = 0xffff; @@ -593,16 +593,16 @@ void CustomAnimationPane::updateControls() mpCBSpeed->SelectEntryPos( nPos ); } - mpPBPropertyMore->Enable( sal_True ); + mpPBPropertyMore->Enable( true ); } else { mpLBProperty->setSubControl( 0 ); - mpFTProperty->Enable( sal_False ); - mpLBProperty->Enable( sal_False ); - mpPBPropertyMore->Enable( sal_False ); - mpFTSpeed->Enable(sal_False); - mpCBSpeed->Enable(sal_False); + mpFTProperty->Enable( false ); + mpLBProperty->Enable( false ); + mpPBPropertyMore->Enable( false ); + mpFTSpeed->Enable(false); + mpCBSpeed->Enable(false); mpLBStart->SetNoSelection(); mpCBSpeed->SetNoSelection(); mpFTEffect->SetText( maStrModify ); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 97783006139f..dcae7ebbaa0f 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -120,8 +120,8 @@ struct TransitionEffect mfTime = 0.0; mePresChange = PRESCHANGE_MANUAL; mbSoundOn = sal_False; - mbLoopSound = sal_False; - mbStopSound = sal_False; + mbLoopSound = false; + mbStopSound = false; mbEffectAmbiguous = false; mbDurationAmbiguous = false; @@ -170,12 +170,12 @@ struct TransitionEffect { if( mbStopSound ) { - rOutPage.SetStopSound( sal_True ); + rOutPage.SetStopSound( true ); rOutPage.SetSound( sal_False ); } else { - rOutPage.SetStopSound( sal_False ); + rOutPage.SetStopSound( false ); rOutPage.SetSound( mbSoundOn ); rOutPage.SetSoundFile( maSound ); } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 0f4ca1daed19..2c9460a330c6 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -122,7 +122,7 @@ bool PathDragMove::BeginSdrDrag() } } Show(); - return sal_True; + return true; } bool PathDragMove::EndSdrDrag(bool /*bCopy*/) @@ -130,7 +130,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) Hide(); if( mxTag.is() ) mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() ); - return sal_True; + return true; } // -------------------------------------------------------------------- @@ -190,7 +190,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) pPathObj->SetPathPoly( aDragPoly ); } } - return sal_True; + return true; } // -------------------------------------------------------------------- @@ -792,7 +792,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(sal_True); + ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(true); if(bWasSnapEnabled) mrView.SetSnapEnabled(sal_False); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index fdcba15d6300..50647684ae80 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -703,7 +703,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); if (pDrawViewShell.get() != NULL) { - pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, sal_False); + pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, false); pDrawViewShell->SwitchPage((pPage->GetPageNum() - 1) >> 1); SfxDispatcher* pDispatcher = getDispatcher( mrBase ); diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 2e670f261a84..77cb12405725 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -70,7 +70,7 @@ public: void SelectNextAnnotation(bool bForeward); - void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = sal_False ); + void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = false ); void GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void InsertAnnotation(); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index a2dcb380fef8..4989dceb63ed 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -149,7 +149,7 @@ bool AnnotationDragMove::EndSdrDrag(bool /*bCopy*/) Hide(); if( mxTag.is() ) mxTag->Move( DragStat().GetDX(), DragStat().GetDY() ); - return sal_True; + return true; } void AnnotationDragMove::CancelSdrDrag() diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index cafa427b724c..27271bf5833e 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -198,7 +198,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName, SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); if( pStm ) - xOptionStorage = new SvStorage( pStm, sal_True ); + xOptionStorage = new SvStorage( pStm, true ); } OUString aStmName; diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index ef5915997be5..1f77d9db299c 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -241,7 +241,7 @@ void SdModule::Execute(SfxRequest& rReq) { ErrorBox(NULL, WB_OK, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE)).Execute(); - SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False ); + SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, false ); if( pLinkItem ) pLinkItem->GetValue().Call( 0 ); } @@ -282,7 +282,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) pDoc->StopWorkStartupDelay(); } - SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, sal_False); + SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, false); SfxViewFrame::LoadDocumentIntoFrame( *pDocSh, pFrmItem, ::sd::OUTLINE_FACTORY_ID ); ::sd::ViewShell* pViewSh = pDocSh->GetViewShell(); @@ -507,7 +507,7 @@ SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Ref SfxObjectShellLock xDocShell; SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) ); sal_uLong lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, sal_True, pSet ); @@ -534,7 +534,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if ( SvtModuleOptions().IsImpress() ) { Reference< XFrame > xTargetFrame; - SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False); + SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, false); if ( pFrmItem ) xTargetFrame = pFrmItem->GetFrame(); @@ -577,7 +577,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) // So that you can open the document without AutoLayout-Dialog pOpt->SetStartWithTemplate(sal_False); if(bNewDocDirect && !pPilotDlg->GetStartWithFlag()) - bStartWithTemplate = sal_False; + bStartWithTemplate = false; if( pPilotDlg->GetStartType() == ST_OPEN ) { @@ -628,7 +628,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) } catch (const ::com::sun::star::uno::Exception&) { - DBG_ASSERT (sal_False, "caught IllegalArgumentException while loading document from Impress autopilot"); + DBG_ASSERT (false, "caught IllegalArgumentException while loading document from Impress autopilot"); } } } @@ -775,7 +775,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF // Unfortunately, the printer does not provide an exact format // like A4 Size aSize(pPrinter->GetPaperSize()); - Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, sal_True); + Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, true); if (ePaper != PAPER_USER) { diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index b108c8643ac9..e9664f3839e7 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -576,7 +576,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject pDoc->BurnInStyleSheetAttributes(); rxOStm->SetBufferSize( 16348 ); - Reference< XComponent > xComponent( new SdXImpressDocument( pDoc, sal_True ) ); + Reference< XComponent > xComponent( new SdXImpressDocument( pDoc, true ) ); pDoc->setUnoModel( Reference< XInterface >::query( xComponent ) ); { diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 5442d31bd0ff..0d91b89e3c5f 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -228,7 +228,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) ); mpLayoutSet2->SetColCount( 4 ); - mpLayoutSet2->EnableFullItemMode( sal_False ); + mpLayoutSet2->EnableFullItemMode( false ); mpLayoutSet2->SetColor( GetControlBackground() ); fillLayoutValueSet( mpLayoutSet2, &v_standard[0] ); @@ -254,7 +254,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const sSlotStr = ".uno:DuplicatePage"; else sSlotStr = ".uno:Undo"; - aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False ); + aSlotImage = ::GetImage( mxFrame, sSlotStr, false ); OUString sSlotTitle; if( bInsertPage ) diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index a27b4885c9f4..36c53ef424bf 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -139,7 +139,7 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt ) sal_uInt16 nPageId = SDRPAGE_NOTFOUND; Point aPos( PixelToLogic( rEvt.maPosPixel ) ); sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc().GetLayerAdmin().GetLayerID( - GetPageText( GetPageId( aPos ) ), sal_False ); + GetPageText( GetPageId( aPos ) ), false ); nRet = pDrViewSh->AcceptDrop( rEvt, *this, NULL, nPageId, nLayerId ); @@ -156,7 +156,7 @@ sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_uInt16 nPageId = SDRPAGE_NOTFOUND; sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc().GetLayerAdmin().GetLayerID( - GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), sal_False ); + GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), false ); sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, NULL, nPageId, nLayerId ); EndSwitchPage(); @@ -216,7 +216,7 @@ long LayerTabBar::AllowRenaming() OUString aNewName( GetEditText() ); if (aNewName.isEmpty() || - (rLayerAdmin.GetLayer( aNewName, sal_False ) && aLayerName != aNewName) ) + (rLayerAdmin.GetLayer( aNewName, false ) && aLayerName != aNewName) ) { // Name already exists WarningBox aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ), @@ -255,7 +255,7 @@ void LayerTabBar::EndRenaming() SdDrawDocument& rDoc = pView->GetDoc(); OUString aLayerName = pView->GetActiveLayer(); SdrLayerAdmin& rLayerAdmin = rDoc.GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); + SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, false); if (pLayer) { @@ -295,7 +295,7 @@ void LayerTabBar::EndRenaming() void LayerTabBar::ActivatePage() { - if ( /*IsInSwitching*/ 1 && pDrViewSh!=NULL) + if ( /*IsInSwitching*/ true && pDrViewSh!=NULL) { SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 09b129617986..47e3e7afa72d 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -38,7 +38,7 @@ void RequestNavigatorUpdate (SfxBindings* pBindings) if (pBindings != NULL && pBindings->GetDispatcher() != NULL) { - SfxBoolItem aItem (SID_NAVIGATOR_INIT, sal_True); + SfxBoolItem aItem (SID_NAVIGATOR_INIT, true); pBindings->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 8e46db611766..8487e98c1c97 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -100,7 +100,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog (void) // check. if (aResult.empty()) { - SfxBoolItem aItem (SID_SPELL_DIALOG, sal_False); + SfxBoolItem aItem (SID_SPELL_DIALOG, false); GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, SFX_CALLMODE_ASYNCHRON, diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 57c5325908d2..d4ae25cbba4b 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -168,7 +168,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, // create new document with page pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL); - SdPage* pPage = (SdPage*) pMyDoc->AllocPage(sal_False); + SdPage* pPage = (SdPage*) pMyDoc->AllocPage(false); pMyDoc->InsertPage(pPage); pControllerItem = new AnimationControllerItem( SID_ANIMATOR_STATE, this, pBindings ); @@ -386,8 +386,8 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) if (m_FrameList.empty() || p == &aRbtGroup || aRbtGroup.IsChecked()) { aTimeField.SetText( OUString() ); - aTimeField.Enable( sal_False ); - aLbLoopCount.Enable( sal_False ); + aTimeField.Enable( false ); + aLbLoopCount.Enable( false ); } else if( p == &aRbtBitmap || aRbtBitmap.IsChecked() ) { @@ -412,7 +412,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) bAllObjects = pBtn == &aBtnGetAllObjects; // Code now in AddObj() - SfxBoolItem aItem( SID_ANIMATOR_ADD, sal_True ); + SfxBoolItem aItem( SID_ANIMATOR_ADD, true ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -501,7 +501,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) { // Code now in CreatePresObj() - SfxBoolItem aItem( SID_ANIMATOR_CREATE, sal_True ); + SfxBoolItem aItem( SID_ANIMATOR_CREATE, true ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -602,15 +602,15 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) else { // if no object is in the list - aBtnFirst.Enable( sal_False ); - aBtnReverse.Enable( sal_False ); - aBtnPlay.Enable( sal_False ); - aBtnLast.Enable( sal_False ); - aNumFldBitmap.Enable( sal_False ); - aTimeField.Enable( sal_False ); - aLbLoopCount.Enable( sal_False ); - aBtnRemoveBitmap.Enable( sal_False ); - aBtnRemoveAll.Enable( sal_False ); + aBtnFirst.Enable( false ); + aBtnReverse.Enable( false ); + aBtnPlay.Enable( false ); + aBtnLast.Enable( false ); + aNumFldBitmap.Enable( false ); + aTimeField.Enable( false ); + aLbLoopCount.Enable( false ); + aBtnRemoveBitmap.Enable( false ); + aBtnRemoveAll.Enable( false ); //aFtAdjustment.Enable(); //aLbAdjustment.Enable(); @@ -618,13 +618,13 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) if( bMovie && bDisableCtrls ) { - aBtnGetOneObject.Enable( sal_False ); - aBtnGetAllObjects.Enable( sal_False ); - aRbtGroup.Enable( sal_False ); - aRbtBitmap.Enable( sal_False ); - aBtnCreateGroup.Enable( sal_False ); - aFtAdjustment.Enable( sal_False ); - aLbAdjustment.Enable( sal_False ); + aBtnGetOneObject.Enable( false ); + aBtnGetAllObjects.Enable( false ); + aRbtGroup.Enable( false ); + aRbtBitmap.Enable( false ); + aBtnCreateGroup.Enable( false ); + aFtAdjustment.Enable( false ); + aLbAdjustment.Enable( false ); } else { @@ -636,8 +636,8 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) aRbtBitmap.Enable(); aBtnCreateGroup.Enable(!m_FrameList.empty()); - aFtAdjustment.Enable( sal_True ); - aLbAdjustment.Enable( sal_True ); + aFtAdjustment.Enable( true ); + aLbAdjustment.Enable( true ); } ClickRbtHdl( NULL ); @@ -813,7 +813,7 @@ sal_Bool AnimationWindow::Close() } else { - SfxBoolItem aItem( SID_ANIMATION_OBJECTS, sal_False ); + SfxBoolItem aItem( SID_ANIMATION_OBJECTS, false ); GetBindings().GetDispatcher()->Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -901,7 +901,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) } // if a animated GIF is taken, only such one can be created aRbtBitmap.Check(); - aRbtGroup.Enable( sal_False ); + aRbtGroup.Enable( false ); bAnimObj = sal_True; } } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 106a0ef591d7..d047cb06fad6 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -347,7 +347,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, m_pLbCustomPages->SetDragDropMode( SV_DRAGDROP_CTRL_MOVE ); m_pLbCustomPages->SetHighlightRange(); - m_pBtnOK->Enable( sal_False ); + m_pBtnOK->Enable( false ); CheckState(); } diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 207be8873923..6ebe262b8c8e 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1117,7 +1117,7 @@ void AssistentDlgImpl::UpdatePage() { // Show elements on first page depending of start type SetStartType( GetStartType() ); - mpPage1TemplateRB->Enable(sal_True /*mbTemplatesReady*/); + mpPage1TemplateRB->Enable(true /*mbTemplatesReady*/); break; } @@ -1128,11 +1128,11 @@ void AssistentDlgImpl::UpdatePage() if( GetStartType() != ST_EMPTY ) { - mpPage2Medium5RB->Enable( sal_True ); + mpPage2Medium5RB->Enable( true ); } else { - mpPage2Medium5RB->Enable( sal_False ); + mpPage2Medium5RB->Enable( false ); if(mpPage2Medium5RB->IsChecked()) mpPage2Medium1RB->Check(); } @@ -1423,7 +1423,7 @@ void AssistentDlgImpl::UpdateUserData() { pPage->SetObjText( pObj, NULL, PRESOBJ_TITLE, aTopic ); pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), sal_True ); - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(false); } } @@ -1440,7 +1440,7 @@ void AssistentDlgImpl::UpdateUserData() { pPage->SetObjText( pObj, NULL, PRESOBJ_OUTLINE, aStrTmp ); pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), sal_True ); - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(false); } else { @@ -1449,7 +1449,7 @@ void AssistentDlgImpl::UpdateUserData() { pPage->SetObjText( pObj, NULL, PRESOBJ_TEXT, aStrTmp ); pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), sal_True ); - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(false); } } } @@ -1548,9 +1548,9 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) if(IsOwnFormat(aDocFile)) { SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) ); if(bDocPreview) - pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) ); + pSet->Put( SfxBoolItem( SID_PREVIEW, true ) ); RestorePassword( pSet, aDocFile ); if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, sal_True, pSet )) != 0 ) ErrorHandler::HandleError(lErr); @@ -1563,7 +1563,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile )); aReq.AppendItem( SfxStringItem( SID_REFERER, OUString() ) ); aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); - aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); + aReq.AppendItem( SfxBoolItem( SID_HIDDEN, true ) ); aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) ); const SfxViewFrameItem* pRet = PTR_CAST( SfxViewFrameItem, SFX_APP()->ExecuteSlot( aReq ) ); @@ -1593,8 +1593,8 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) if(IsOwnFormat(aLayoutFile)) { SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) ); + pSet->Put( SfxBoolItem( SID_PREVIEW, true ) ); RestorePassword( pSet, aLayoutFile ); if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, sal_True, pSet )) != 0 ) @@ -1647,7 +1647,7 @@ void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const OUString& rP if(pMedium && pMedium->IsStorage()) { SfxItemSet * pSet = pMedium->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False); + SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); uno::Sequence < beans::NamedValue > aEncryptionData; if (pEncryptionDataItem) pEncryptionDataItem->GetValue() >>= aEncryptionData; diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 9eff528aaa0b..ac43e960cca2 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -82,7 +82,7 @@ SvTreeListEntry* SdPageListControl::InsertPage( const OUString& rPageName ) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, m_pCheckButton)); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // otherwise boom! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); // otherwise boom! pEntry->AddItem( new SvLBoxString( pEntry, 0, rPageName ) ); GetModel()->Insert( pEntry ); @@ -94,7 +94,7 @@ void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const OUString& r { SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->AddItem( new SvLBoxString( pEntry, 0, OUString() ) ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // otherwise boom! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); // otherwise boom! pEntry->AddItem( new SvLBoxString( pEntry, 0, rTitle ) ); GetModel()->Insert( pEntry,pParent ); } diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index e7e0c76d2bb9..c153f69db15e 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -237,8 +237,8 @@ void SdDocPreviewWin::updateViewSettings() const Size aSize( pPage->GetSize() ); - pView->SetBordVisible( sal_False ); - pView->SetPageVisible( sal_False ); + pView->SetBordVisible( false ); + pView->SetPageVisible( false ); pView->ShowSdrPage( pPage ); const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index b3a80b80a5f2..9f960c6f4d31 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -269,7 +269,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl) if( nSId > 0 ) { - SfxBoolItem aItem( nSId, sal_True ); + SfxBoolItem aItem( nSId, true ); mpBindings->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SLOT |SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -806,7 +806,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) // deletion of the navigator window. Calling the // parents Notify after this is unsafe. Therefore we // return now. - return sal_True; + return true; } } } diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 94832104ea91..296961974343 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -142,7 +142,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) ImplNewStartHdl(m_pNewStartCB); m_pNewStartNF->SaveValue(); m_pNewStartNumberCB->SaveValue(); - mbModified = sal_False; + mbModified = false; } IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl) diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 7c1e1d04b924..eb4f671bab9c 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -316,7 +316,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) if( bWindow ) { - aCbxAlwaysOnTop->Enable( sal_False ); + aCbxAlwaysOnTop->Enable( false ); aCbxAlwaysOnTop->Check( sal_False ); } else diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 4200f135e03f..7df95a698394 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -315,7 +315,7 @@ sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const case PO_OUTLINE_8: return 7; case PO_OUTLINE_9: return 8; default: - DBG_ASSERT( sal_False, "Wrong Po! [CL]"); + DBG_ASSERT( false, "Wrong Po! [CL]"); } return 0; } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 17b456b609ae..46b344f7f121 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -632,7 +632,7 @@ void SdPageObjsTLB::AddShapeList ( rList, !rList.HasObjectNavigationOrder() /* use navigation order, if available */, IM_FLAT, - sal_False /*not reverse*/); + false /*not reverse*/); sal_Bool bMarked=sal_False; if(bisInSdNavigatorWin) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 5b92eab867fb..163f84a4d76e 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -657,7 +657,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) void SdTpOptionsMisc::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,false); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 379aa76caf9d..d16eef4e4a1a 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -56,11 +56,11 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect) ClientView* pView = new ClientView(this, pOut, NULL); - pView->SetHlplVisible(sal_False); - pView->SetGridVisible(sal_False); - pView->SetBordVisible(sal_False); - pView->SetPageVisible(sal_False); - pView->SetGlueVisible(sal_False); + pView->SetHlplVisible(false); + pView->SetGridVisible(false); + pView->SetBordVisible(false); + pView->SetPageVisible(false); + pView->SetGlueVisible(false); SdPage* pSelectedPage = NULL; diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 5304db5940ae..013e0c9c669b 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -799,7 +799,7 @@ sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark) if (eNewEditMode != pDrawViewShell->GetEditMode()) { // EditMode setzen - pDrawViewShell->ChangeEditMode(eNewEditMode, sal_False); + pDrawViewShell->ChangeEditMode(eNewEditMode, false); } // Make the bookmarked page the current page. This is done @@ -924,7 +924,7 @@ sal_Bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) if (eNewEditMode != pDrViewSh->GetEditMode()) { // EditMode setzen - pDrViewSh->ChangeEditMode(eNewEditMode, sal_False); + pDrViewSh->ChangeEditMode(eNewEditMode, false); } // Jump to the page. This is done by using the API because this @@ -1030,7 +1030,7 @@ sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) if (eNewEditMode != pDrViewSh->GetEditMode()) { // EditMode setzen - pDrViewSh->ChangeEditMode(eNewEditMode, sal_False); + pDrViewSh->ChangeEditMode(eNewEditMode, false); } // Jump to the page. This is done by using the API because this diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 15539547c558..c25458dd5834 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -147,7 +147,7 @@ DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, sal_Bool bData mbOwnPrinter(sal_False), mbNewDocument( sal_True ) { - Construct( sal_False ); + Construct( false ); } DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, @@ -193,7 +193,7 @@ DrawDocShell::~DrawDocShell() delete mpDoc; // that the navigator get informed about the disappearance of the document - SfxBoolItem aItem(SID_NAVIGATOR_INIT, sal_True); + SfxBoolItem aItem(SID_NAVIGATOR_INIT, true); SfxViewFrame* pFrame = mpViewShell ? mpViewShell->GetFrame() : GetFrame(); if( !pFrame ) diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 5596e49bda08..f2cb8095dd4e 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -632,7 +632,7 @@ void FrameworkHelper::HandleModeChangeSlot ( pIsActive, SfxBoolItem, (sal_uInt16)nSlotId, - sal_False); + false); bIsActive = pIsActive->GetValue (); } } diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 285d12d6bf5b..3226682ab49a 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -181,7 +181,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) if (aChars.isEmpty()) { SfxAllItemSet aSet( mpDoc->GetPool() ); - aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SfxItemSet aFontAttr( mpDoc->GetPool() ); mpView->GetAttributes( aFontAttr ); @@ -202,8 +202,8 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFItem ) { aFont.SetName( pFItem->GetFamilyName() ); diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 616e5ff7579c..ae5f00fea11c 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -68,7 +68,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, sal_False ); + aNewAttr.Put( aEditAttr, false ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0; diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 27a512f61266..64e7b52016a2 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -404,7 +404,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const // copied code from E3dView::InitScene double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0)); Camera3D aCam(pScene->GetCamera()); - aCam.SetAutoAdjustProjection(sal_False); + aCam.SetAutoAdjustProjection(false); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); ::basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mpView->GetDefaultCamPosZ(); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 17b99aeeb430..fc7808abade8 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -79,12 +79,12 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) if (pArgs) { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); - SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, sal_False); - SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, sal_False); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, false); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, false); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, false); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, false); + SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, false); + SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, false); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 72ff44b32ad3..85574df226e6 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -104,10 +104,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) { case SID_DRAW_ELLIPSE : { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, false); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, false); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, false); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, false); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, @@ -122,10 +122,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) case SID_DRAW_RECT : { - SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, sal_False); - SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, sal_False); - SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, sal_False); - SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, sal_False); + SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, false); + SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, false); + SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, false); + SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, false); Rectangle aNewRectangle (pMouseStartX->GetValue (), pMouseStartY->GetValue (), @@ -241,7 +241,7 @@ sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES)); - pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False)); + pObj->SetLayer(rAdmin.GetLayerID(aStr, false)); } // init text position when vertica caption object is created @@ -424,7 +424,7 @@ void FuConstructRectangle::Deactivate() nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { - mpView->SetGlueVisible( sal_False ); + mpView->SetGlueVisible( false ); } FuConstruct::Deactivate(); } @@ -509,12 +509,12 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) if (pSheet) { - pObj->SetStyleSheet(pSheet, sal_False); + pObj->SetStyleSheet(pSheet, false); } SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES)); - pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False)); + pObj->SetLayer(rAdmin.GetLayerID(aStr, false)); } else if (nSlotId == OBJ_CUSTOMSHAPE ) { diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index a788b9fb1ec2..e8d5450bf63c 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -53,7 +53,7 @@ FuConstruct::FuConstruct ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), - bSelectionChanged(sal_False) + bSelectionChanged(false) { } @@ -68,7 +68,7 @@ sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); bMBDown = sal_True; - bSelectionChanged = sal_False; + bSelectionChanged = false; if ( mpView->IsAction() ) { @@ -350,7 +350,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, if (pSheet) { // applying style sheet for background objects - pObj->SetStyleSheet(pSheet, sal_False); + pObj->SetStyleSheet(pSheet, false); SfxItemSet& rSet = pSheet->GetItemSet(); const XFillStyleItem& rFillStyle = (const XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE); if ( bForceFillStyle ) @@ -379,7 +379,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, DBG_ASSERT(pSheet, "Stylesheet missing"); if (pSheet) { - pObj->SetStyleSheet(pSheet, sal_False); + pObj->SetStyleSheet(pSheet, false); SfxItemSet aAttr(*mpView->GetDefaultAttr().Clone()); aAttr.Put(pSheet->GetItemSet().Get(XATTR_FILLSTYLE)); pObj->SetMergedItemSet(aAttr); diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 971be692ed80..438e23212831 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -69,8 +69,8 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) { FuConstruct::DoExecute( rReq ); - SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, sal_False ); - SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False ); + SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, false ); + SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, false ); if( pInventorItem ) nInventor = pInventorItem->GetValue(); if( pIdentifierItem ) diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index d1600aa67c32..3816ca81eb47 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -228,8 +228,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( pObj ) { - pObj->SetMoveProtect( sal_False ); - pObj->SetResizeProtect( sal_False ); + pObj->SetMoveProtect( false ); + pObj->SetResizeProtect( false ); } } diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 19c95a4193c1..f91c4c40bd93 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -104,7 +104,7 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); - bool bOrtho = sal_False; + bool bOrtho = false; sal_Bool bRestricted = sal_True; @@ -219,7 +219,7 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); - bool bOrtho = sal_False; + bool bOrtho = false; sal_Bool bRestricted = sal_True; diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 4ad658b2b0dc..eb5bd40a915f 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -134,7 +134,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) if ( nDepth == 0 ) { // page with title & structuring! - SdPage* pPage = (SdPage*) mpDoc->AllocPage(sal_False); + SdPage* pPage = (SdPage*) mpDoc->AllocPage(false); pPage->SetSize(pActualPage->GetSize() ); pPage->SetBorder(pActualPage->GetLftBorder(), pActualPage->GetUppBorder(), @@ -156,7 +156,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // notes-page - SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); + SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(false); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), pActualNotesPage->GetUppBorder(), @@ -200,7 +200,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) pTextObj->SetOutlinerParaObject(pOutlinerParaObject); - pTextObj->SetEmptyPresObj(sal_False); + pTextObj->SetEmptyPresObj(false); SfxStyleSheet* pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); pTextObj->NbcSetStyleSheet(pSheet, sal_False); @@ -232,7 +232,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) delete pTempOutl; pOutlineObj->SetOutlinerParaObject( pOPO ); - pOutlineObj->SetEmptyPresObj(sal_False); + pOutlineObj->SetEmptyPresObj(false); // remove hard attributes (Flag to sal_True) SfxItemSet aAttr(mpDoc->GetPool()); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 87d3fda15753..053be3d51f84 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -258,7 +258,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma { OUString sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush" ) ); mpDoc->BegUndo( sLabel ); - mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_False, sal_True ) ); + mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) ); } mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 9f507024f3c0..2387627c0b9a 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -397,7 +397,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; - SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, false ); if ( nSlotId == SID_INSERT_OBJECT && pNameItem ) { SvGlobalName aClassName = pNameItem->GetValue(); @@ -548,7 +548,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { // the empty OLE object gets a new IPObj bInsertNewObject = sal_False; - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(false); ( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL); ( (SdrOle2Obj*) pObj)->SetObjRef(xObj); ( (SdrOle2Obj*) pObj)->SetPersistName(aName); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 9fbaafce1399..dffa7092cdb4 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -238,8 +238,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) } else { - SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, sal_False); - SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, sal_False); + SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, false); + SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, false); aFile = pFileName->GetValue (); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 42a732dbd735..d22098310029 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -76,7 +76,7 @@ void FuLineEnd::DoExecute( SfxRequest& ) // bCanConvToPath is sal_True for group objects, // but it crashes on ConvertToPathObj()! { - pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( sal_True, sal_False ); + pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( true, false ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) return; // Cancel, additional security, but it does not help diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index c9d31b09afa9..1aeee02f9a05 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -91,8 +91,8 @@ void FuMorph::DoExecute( SfxRequest& ) pCloneObj2->SetOutlinerParaObject(NULL); // create path objects - SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(sal_False, sal_False); - SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(sal_False, sal_False); + SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(false, false); + SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(false, false); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractMorphDlg* pDlg = pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0; if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 470e00811f8c..251e94d714f7 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -348,7 +348,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nAnimationSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_ACTIVE); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, false)); if (nEffectSet == ATTR_SET) aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (sal_uInt16)eEffect)); @@ -374,7 +374,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nFadeOutSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_FADEOUT); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, false)); if (nFadeColorSet == ATTR_SET) aSet.Put(SvxColorItem(aFadeColor, ATTR_ANIMATION_COLOR)); @@ -388,14 +388,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nInvisibleSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_INVISIBLE); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, false)); if (nSoundOnSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, bSoundOn)); else if (nSoundOnSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_SOUNDON); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, false)); if (nSoundFileSet == ATTR_SET) aSet.Put(SfxStringItem(ATTR_ANIMATION_SOUNDFILE, aSound)); @@ -407,7 +407,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_PLAYFULL); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, false)); if (nClickActionSet == ATTR_SET) aSet.Put(SfxAllEnumItem(ATTR_ACTION, (sal_uInt16)eClickAction)); @@ -438,14 +438,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nSecondSoundOnSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_SOUNDON); else - aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, false)); if (nSecondPlayFullSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, bSecondPlayFull)); else if (nPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_PLAYFULL); else - aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, sal_False)); + aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, false)); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0; diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index efdc0581fdb0..816adbfbe824 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -78,7 +78,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, sal_False ); + aNewAttr.Put( aEditAttr, false ); // create and execute dialog SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); @@ -146,7 +146,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq) return; } - SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, nSId, sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, nSId, false ); if ( !pItem ) { rReq.Done(); @@ -157,7 +157,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq) { SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); - aNewAttr.Put( aEditAttr, sal_False ); + aNewAttr.Put( aEditAttr, false ); } const DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >(mpViewShell); diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 354db9900ab0..228360705491 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -152,7 +152,7 @@ sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem( SID_FILE_NAME, ( (SvxURLField*) pField)->GetURL() ); SfxStringItem aReferer( SID_REFERER, mpDocSh->GetMedium()->GetName() ); - SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); + SfxBoolItem aBrowseItem( SID_BROWSE, true ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); if ( rMEvt.IsMod1() ) diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 5975a9b7292f..762c47daba9b 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -336,7 +336,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) || ( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) && ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) ) - mbPageBckgrdDeleted = sal_True; + mbPageBckgrdDeleted = true; bool bSetToAllPages = false; @@ -599,7 +599,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( mpBackgroundObjUndoAction ) { // set merge flag, because a SdUndoGroupAction could have been inserted before - mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, sal_True ); + mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, true ); mpBackgroundObjUndoAction = 0; } diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 9bf40b570052..f681b232d9fa 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -636,14 +636,14 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(0L == pHdl->GetPointNum()) { - if(pEdgeObj->GetConnection(sal_True).GetObject()) + if(pEdgeObj->GetConnection(true).GetObject()) { bIsMoveOfConnectedHandle = sal_True; } } if(1L == pHdl->GetPointNum()) { - if(pEdgeObj->GetConnection(sal_False).GetObject()) + if(pEdgeObj->GetConnection(false).GetObject()) { bIsMoveOfConnectedHandle = sal_True; } @@ -758,7 +758,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); + ((SdrDragStat&)rDragStat).SetNoSnap(true); if(bWasSnapEnabled) mpView->SetSnapEnabled(sal_False); diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index c29b839558ac..957eb0025b00 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -182,7 +182,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) } else if(mpViewShell && (pArgs->Count () == 1)) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, false); mpViewShell->SetZoom (pScale->GetValue ()); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom ); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 0a75b11ba7c7..1dc415d6eb1e 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -262,7 +262,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); - SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); + SfxBoolItem aBrowseItem( SID_BROWSE, true ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); mpWindow->ReleaseMouse(); @@ -774,12 +774,12 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { // Added UNDOs for the WaterCan mode. This was never done in // the past, thus it was missing all the time. - SdrUndoAction* pUndoAttr = mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pWaterCanCandidate, sal_True, sal_True); + SdrUndoAction* pUndoAttr = mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pWaterCanCandidate, true, true); mpView->BegUndo(pUndoAttr->GetComment()); mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate)); mpView->AddUndo(pUndoAttr); - pWaterCanCandidate->SetStyleSheet (pStyleSheet, sal_False); + pWaterCanCandidate->SetStyleSheet (pStyleSheet, false); mpView->EndUndo(); } @@ -1241,7 +1241,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); + SfxBoolItem aBrowseItem( SID_BROWSE, true ); mpWindow->ReleaseMouse(); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, @@ -1283,7 +1283,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aStrItem(SID_FILE_NAME, sBookmark); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); + SfxBoolItem aBrowseItem( SID_BROWSE, true ); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); @@ -1371,7 +1371,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) if( INET_PROT_FILE == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); + SfxBoolItem aBrowsing( SID_BROWSE, true ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index c6041cdb98bf..b7fd1fc77d51 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -118,7 +118,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) OUString aPage; long nValue32; sal_Bool bValue; - bool bValuesChanged = sal_False; + bool bValuesChanged = false; pDlg->GetAttr( aDlgSet ); diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 7bd272159037..5d77e970dac0 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -61,7 +61,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) sal_Bool bCreateNew = sal_True; // Get index of snap line or snap point from the request. - SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, false); if (pHelpLineIndex != NULL) { nHelpLine = static_cast<sal_uInt16>(pHelpLineIndex->GetValue()); diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 6eb1f15663f7..6ee996c8611c 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -117,7 +117,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); // page with title & structuring! - pSummaryPage = (SdPage*) mpDoc->AllocPage(sal_False); + pSummaryPage = (SdPage*) mpDoc->AllocPage(false); pSummaryPage->SetSize(pActualPage->GetSize() ); pSummaryPage->SetBorder(pActualPage->GetLftBorder(), pActualPage->GetUppBorder(), @@ -137,7 +137,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings()); // notes-page - SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); + SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(false); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), pActualNotesPage->GetUppBorder(), @@ -200,7 +200,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) } pTextObj->SetOutlinerParaObject( pOutl->CreateParaObject() ); - pTextObj->SetEmptyPresObj(sal_False); + pTextObj->SetEmptyPresObj(false); // remove hard attributes (Flag to sal_True) SfxItemSet aAttr(mpDoc->GetPool()); diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index a6147f1ed723..aec57f77a6d1 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -132,8 +132,8 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) case SID_STYLE_FAMILY: case SID_STYLE_NEW_BY_EXAMPLE: { - SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_APPLY_STYLE, sal_False ); - SFX_REQUEST_ARG( rReq, pFamilyItem, SfxStringItem, SID_STYLE_FAMILYNAME, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, SID_APPLY_STYLE, false ); + SFX_REQUEST_ARG( rReq, pFamilyItem, SfxStringItem, SID_STYLE_FAMILYNAME, false ); if ( pFamilyItem && pNameItem ) { try diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index c96507325b8e..5f151f2cccd2 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -347,7 +347,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); - SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); + SfxBoolItem aBrowseItem( SID_BROWSE, true ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); mpWindow->ReleaseMouse(); @@ -780,7 +780,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if(mxTextObj.is()) { - GetTextObj()->SetDisableAutoWidthOnDragging(sal_True); + GetTextObj()->SetDisableAutoWidthOnDragging(true); } if(!mpView->EndCreateObj(SDRCREATE_FORCEEND)) @@ -823,7 +823,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if(pPara && !pPara->IsVertical()) { // set ParaObject orientation accordingly - pPara->SetVertical(sal_True); + pPara->SetVertical(true); } aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -865,7 +865,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } GetTextObj()->SetMergedItemSet(aSet); - GetTextObj()->SetDisableAutoWidthOnDragging(sal_True); + GetTextObj()->SetDisableAutoWidthOnDragging(true); SetInEditMode(rMEvt, sal_False); } @@ -1158,7 +1158,7 @@ sal_Bool FuText::DeleteDefaultText() (ePresObjKind == PRESOBJ_NOTES || ePresObjKind == PRESOBJ_TEXT)) pOutliner->SetStyleSheet(0, pSheet); - mxTextObj->SetEmptyPresObj(sal_True); + mxTextObj->SetEmptyPresObj(true); bDeleted = sal_True; } } diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 4a735fe064ff..42164eea8065 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -45,7 +45,7 @@ public: virtual void Activate(); virtual void Deactivate(); - virtual void SelectionHasChanged() { bSelectionChanged = sal_True; } + virtual void SelectionHasChanged() { bSelectionChanged = true; } // SJ: setting stylesheet, the use of a filled or unfilled style // is determined by the member nSlotId : diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index 7baa1aa64c3f..e6ff9aa23194 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -387,7 +387,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUr { aArgs.realloc ( ++nEnd ); aArgs[nEnd-1].Name = "DocumentBaseURL"; - aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); + aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( true ); } return xFilter->filter( aArgs ); diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 6eb8a21f044f..aa1bdbc4b737 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -288,7 +288,7 @@ void DocumentHelper::ProvideStyles ( new SdMoveStyleSheetsUndoAction ( &rTargetDocument, aCreatedStyles, - sal_True); + true); pUndoManager->AddUndoAction (pMovStyles); } } @@ -436,7 +436,7 @@ void DocumentHelper::AssignMasterPageToPage ( pDocument->GetDocSh()->GetUndoManager()->AddUndoAction( new SdBackgroundObjUndoAction( *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()), - sal_True); + true); pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); pDocument->SetMasterPage ( diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 5abb05ca0f5e..62289b76d6af 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -569,9 +569,9 @@ SfxRequest LayoutMenu::CreateRequest ( { SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin()); sal_uInt8 aBackground (rLayerAdmin.GetLayerID( - SD_RESSTR(STR_LAYER_BCKGRND), sal_False)); + SD_RESSTR(STR_LAYER_BCKGRND), false)); sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID( - SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False)); + SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false)); ViewShell* pViewShell = mrBase.GetMainViewShell().get(); if (pViewShell == NULL) break; diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index e1d6ee56b31b..54f9aff5037d 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -184,8 +184,8 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume { SfxApplication* pSfxApp = SFX_APP(); SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool()); - pSet->Put (SfxBoolItem (SID_TEMPLATE, sal_True)); - pSet->Put (SfxBoolItem (SID_PREVIEW, sal_True)); + pSet->Put (SfxBoolItem (SID_TEMPLATE, true)); + pSet->Put (SfxBoolItem (SID_PREVIEW, true)); if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, sal_True, pSet)) { mxDocumentShell = NULL; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 4d1c54807a29..040f613dafd5 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -643,7 +643,7 @@ void ShowWindow::DeleteWindowFromPaintView() sal_uInt16 nChild = GetChildCount(); while( nChild-- ) - GetChild( nChild )->Show( sal_False ); + GetChild( nChild )->Show( false ); } void ShowWindow::AddWindowToPaintView() @@ -653,7 +653,7 @@ void ShowWindow::AddWindowToPaintView() sal_uInt16 nChild = GetChildCount(); while( nChild-- ) - GetChild( nChild )->Show( sal_True ); + GetChild( nChild )->Show( true ); } // Overload the sd::Window's CreateAccessible to create a different accessible object diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 8ecd77df3519..429653f6bfa3 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -665,7 +665,7 @@ void SAL_CALL SlideshowImpl::disposing() mpView->DeleteWindowFromPaintView( mpShowWindow ); if( mpView ) - mpView->SetAnimationPause( sal_False ); + mpView->SetAnimationPause( false ); if( mpViewShell ) { @@ -827,7 +827,7 @@ bool SlideshowImpl::startPreview( if( mpView ) { mpView->AddWindowToPaintView( mpShowWindow ); - mpView->SetAnimationPause( sal_True ); + mpView->SetAnimationPause( true ); } // call resize handler @@ -1039,7 +1039,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) if( mpView ) { mpView->AddWindowToPaintView( mpShowWindow ); - mpView->SetAnimationPause( sal_True ); + mpView->SetAnimationPause( true ); } SfxBindings* pBindings = getBindings(); @@ -1460,7 +1460,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) if( !mbIsPaused ) try { - mbIsPaused = sal_True; + mbIsPaused = true; if( mxShow.is() ) { mxShow->pause(sal_True); @@ -1494,7 +1494,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) } else { - mbIsPaused = sal_False;; + mbIsPaused = false;; if( mxShow.is() ) { mxShow->pause(sal_False); @@ -1609,7 +1609,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: if( INET_PROT_FILE == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); + SfxBoolItem aBrowsing( SID_BROWSE, true ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -2186,13 +2186,13 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { - pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, "slot:10617" , sal_False ) ); - pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, "slot:10618" , sal_False ) ); + pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, "slot:10617" , false ) ); + pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, "slot:10618" , false ) ); if( pPageMenu ) { - pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, "slot:10616" , sal_False ) ); - pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, "slot:10619" , sal_False ) ); + pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, "slot:10616" , false ) ); + pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, "slot:10619" , false ) ); } } } @@ -2688,7 +2688,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) // actually it runs always in window mode in case of ActiveX control if ( !maPresSettings.mbFullScreen && mpDocSh && mpDocSh->GetMedium() ) { - SFX_ITEMSET_ARG( mpDocSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + SFX_ITEMSET_ARG( mpDocSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, false ); if ( pItem && pItem->GetValue() ) { // this is a plugin/activex mode, no toolbars should be visible during slide show diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index c6716024433d..faa1c92470c4 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -740,7 +740,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE) { - rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True)); + rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true)); } } diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 53b5bf2ae87d..c7927e939d76 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -256,7 +256,7 @@ void Clipboard::DoDelete (::Window* ) void Clipboard::DoCopy (::Window* pWindow ) { - CreateSlideTransferable( pWindow, sal_False ); + CreateSlideTransferable( pWindow, false ); } @@ -603,7 +603,7 @@ void Clipboard::StartDrag ( maPagesToRemove.clear(); maPagesToSelect.clear(); mbUpdateSelectionPending = false; - CreateSlideTransferable(pWindow, sal_True); + CreateSlideTransferable(pWindow, true); mrController.GetInsertionIndicatorHandler()->UpdatePosition( rPosition, diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 1179330ded88..b0ce46b309be 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -161,7 +161,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) if (rRequest.GetArgs() != NULL) { SFX_REQUEST_ARG(rRequest, pPagesPerRow, SfxUInt16Item, - SID_PAGES_PER_ROW, sal_False); + SID_PAGES_PER_ROW, false); if (pPagesPerRow != NULL) { sal_Int32 nColumnCount = pPagesPerRow->GetValue(); @@ -540,13 +540,13 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) { sal_uInt16 nSId = pShell->GetCurrentFunction()->GetSlotID(); - rSet.Put( SfxBoolItem( nSId, sal_True ) ); + rSet.Put( SfxBoolItem( nSId, true ) ); } - rSet.Put( SfxBoolItem( SID_DRAWINGMODE, sal_False ) ); - rSet.Put( SfxBoolItem( SID_DIAMODE, sal_True ) ); - rSet.Put( SfxBoolItem( SID_OUTLINEMODE, sal_False ) ); - rSet.Put( SfxBoolItem( SID_NOTESMODE, sal_False ) ); - rSet.Put( SfxBoolItem( SID_HANDOUTMODE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_DRAWINGMODE, false ) ); + rSet.Put( SfxBoolItem( SID_DIAMODE, true ) ); + rSet.Put( SfxBoolItem( SID_OUTLINEMODE, false ) ); + rSet.Put( SfxBoolItem( SID_NOTESMODE, false ) ); + rSet.Put( SfxBoolItem( SID_HANDOUTMODE, false ) ); if (pShell!=NULL && pShell->IsMainViewShell()) { @@ -984,8 +984,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ), sal_False ); - sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ), sal_False ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ), false ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ), false ); SetOfByte aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers(); // (#67720#) @@ -1030,7 +1030,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri pDocument->SetChanged( sal_True ); // inform navigator about change - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); if (mrSlideSorter.GetViewShell() != NULL) mrSlideSorter.GetViewShell()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 9b7dcf3bf67e..8a530ff576d3 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -163,7 +163,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) maVisibilityChangeListeners() { // Hide the page that contains the page objects. - SetPageVisible (sal_False); + SetPageVisible (false); // Register the background painter on level 1 to avoid the creation of a // background buffer. diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 343357ae6ce1..7df51bef77ae 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -111,9 +111,9 @@ void DrawViewShell::FuTable(SfxRequest& rReq) sal_Int32 nRows = 0; OUString sTableStyle; - SFX_REQUEST_ARG( rReq, pCols, SfxUInt16Item, SID_ATTR_TABLE_COLUMN, sal_False ); - SFX_REQUEST_ARG( rReq, pRows, SfxUInt16Item, SID_ATTR_TABLE_ROW, sal_False ); - SFX_REQUEST_ARG( rReq, pStyle, SfxStringItem, SID_TABLE_STYLE, sal_False ); + SFX_REQUEST_ARG( rReq, pCols, SfxUInt16Item, SID_ATTR_TABLE_COLUMN, false ); + SFX_REQUEST_ARG( rReq, pRows, SfxUInt16Item, SID_ATTR_TABLE_ROW, false ); + SFX_REQUEST_ARG( rReq, pStyle, SfxStringItem, SID_TABLE_STYLE, false ); if( pCols ) nColumns = pCols->GetValue(); diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 69d8b61623ef..39e2956b9763 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -131,7 +131,7 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () // From the model get the current SdrLayer object via the layer admin. SdrLayerAdmin& rLayerAdmin = pSdModel->GetLayerAdmin (); - SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), sal_True); + SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), true); if (pLayer == NULL) break; diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index d07c2007b4fe..31043caa251b 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -185,7 +185,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes SfxApplication* pApp = SFX_APP(); SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() ); TransformParameters( SID_OPENDOC, lDescriptor, *pSet ); - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, sal_False ); + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, false ); bWasReadOnly = pItem && pItem->GetValue(); @@ -356,7 +356,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes if (pFilter && pStm) { - SotStorageRef aStorage = new SotStorage ( pStm, sal_False ); + SotStorageRef aStorage = new SotStorage ( pStm, false ); if ( !aStorage->GetError() ) { OUString aStreamName("PowerPoint Document"); diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index e7e1c27c8ab5..a4639ea7a28f 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -528,7 +528,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal OUString aLayerName; // Test for existing names - while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName, sal_False) ) + while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName, false) ) { aLayerName = SD_RESSTR(STR_LAYER); aLayerName += OUString::number(nLayer); @@ -661,7 +661,7 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) throw lang::DisposedException(); SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin(); - SdrLayer* pLayer = rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), sal_False ); + SdrLayer* pLayer = rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), false ); if( pLayer == NULL ) throw container::NoSuchElementException(); @@ -703,7 +703,7 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno:: SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin(); - return NULL != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), sal_False ); + return NULL != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), false ); } // XElementAccess diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index a9f7ab4415e8..0740babe319a 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -446,15 +446,15 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate { sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SdPage* pStandardPage = NULL; if( 0 == nPageCount ) { // this is only used for clipboard where we only have one page - pStandardPage = (SdPage*) mpDoc->AllocPage(sal_False); + pStandardPage = (SdPage*) mpDoc->AllocPage(false); Size aDefSize(21000, 29700); // A4-Hochformat pStandardPage->SetSize( aDefSize ); @@ -487,7 +487,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate if( bDuplicate ) pStandardPage = (SdPage*) pPreviousStandardPage->Clone(); else - pStandardPage = (SdPage*) mpDoc->AllocPage(sal_False); + pStandardPage = (SdPage*) mpDoc->AllocPage(false); pStandardPage->SetSize( pPreviousStandardPage->GetSize() ); pStandardPage->SetBorder( pPreviousStandardPage->GetLftBorder(), @@ -508,8 +508,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True ); } - aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); aVisibleLayers.Set(aBckgrnd, bIsPageBack); aVisibleLayers.Set(aBckgrndObj, bIsPageObj); pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); @@ -522,7 +522,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate if( bDuplicate ) pNotesPage = (SdPage*) pPreviousNotesPage->Clone(); else - pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); + pNotesPage = (SdPage*) mpDoc->AllocPage(false); pNotesPage->SetSize( pPreviousNotesPage->GetSize() ); pNotesPage->SetBorder( pPreviousNotesPage->GetLftBorder(), @@ -1888,11 +1888,11 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if ( pOldSdView ) pOldSdView->SdrEndTextEdit(); - pView->SetHlplVisible( sal_False ); - pView->SetGridVisible( sal_False ); - pView->SetBordVisible( sal_False ); - pView->SetPageVisible( sal_False ); - pView->SetGlueVisible( sal_False ); + pView->SetHlplVisible( false ); + pView->SetGridVisible( false ); + pView->SetBordVisible( false ); + pView->SetPageVisible( false ); + pView->SetGlueVisible( false ); pOut->SetMapMode( MAP_100TH_MM ); pOut->IntersectClipRegion( aVisArea ); @@ -2727,7 +2727,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn SdPage* pRefNotesPage = mpModel->mpDoc->GetSdPage( (sal_uInt16)0, PK_NOTES); // create and instert new draw masterpage - SdPage* pMPage = (SdPage*)mpModel->mpDoc->AllocPage(sal_True); + SdPage* pMPage = (SdPage*)mpModel->mpDoc->AllocPage(true); pMPage->SetSize( pPage->GetSize() ); pMPage->SetBorder( pPage->GetLftBorder(), pPage->GetUppBorder(), @@ -2744,7 +2744,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn xDrawPage = uno::Reference< drawing::XDrawPage >::query( pMPage->getUnoPage() ); // create and instert new notes masterpage - SdPage* pMNotesPage = (SdPage*)mpModel->mpDoc->AllocPage(sal_True); + SdPage* pMNotesPage = (SdPage*)mpModel->mpDoc->AllocPage(true); pMNotesPage->SetSize( pRefNotesPage->GetSize() ); pMNotesPage->SetPageKind(PK_NOTES); pMNotesPage->SetBorder( pRefNotesPage->GetLftBorder(), diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index d1b867cef058..92f939a5f509 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1012,7 +1012,7 @@ void SdXShape::SetEmptyPresObj( bool bEmpty ) throw() pObj->SetOutlinerParaObject( pOutliner->CreateParaObject() ); pOutliner->Clear(); } - while(0); + while(false); } pObj->SetEmptyPresObj(bEmpty); @@ -1060,7 +1060,7 @@ void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumen if( pStyleSheet == 0 || (pStyleSheet->GetFamily() != SD_STYLE_FAMILY_GRAPHICS && pStyleSheet->GetFamily() != SD_STYLE_FAMILY_MASTERPAGE) ) throw lang::IllegalArgumentException(); - pObj->SetStyleSheet( pStyleSheet, sal_False ); + pObj->SetStyleSheet( pStyleSheet, false ); SdDrawDocument* pDoc = mpModel? mpModel->GetDoc() : NULL; if( pDoc ) @@ -1447,7 +1447,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno bOk = sal_True; } } - while(0); + while(false); if( !bOk ) throw lang::IllegalArgumentException(); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 6a0e9d11147c..21fd8b534ee0 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -748,7 +748,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False), bVisible); + aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false), bVisible); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -768,7 +768,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False), bVisible); + aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false), bVisible); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -1167,7 +1167,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False)); + aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false)); } else { @@ -1186,7 +1186,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False)); + aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false)); } else { diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index fd952534f0d9..e1f5cc3aa268 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -136,13 +136,13 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) mpDrawDocument(pDoc), mnConversionLanguage(LANGUAGE_NONE), mnIgnoreCurrentPageChangesLevel(0), - mbStringFound(sal_False), + mbStringFound(false), mbMatchMayExist(false), mnPageCount(0), mnObjectCount(0), - mbEndOfSearch(sal_False), - mbFoundObject(sal_False), - mbError(sal_False), + mbEndOfSearch(false), + mbFoundObject(false), + mbError(false), mbDirectionIsForward(true), mbRestrictSearchToSelection(false), maMarkListCopy(), @@ -266,13 +266,13 @@ void Outliner::PrepareSpelling (void) ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell) { - mbStringFound = sal_False; + mbStringFound = false; mbWholeDocumentProcessed = false; // Supposed that we are not located at the very beginning/end of // the document then there may be a match in the document // prior/after the current position. - mbMatchMayExist = sal_True; + mbMatchMayExist = true; maObjectIterator = ::sd::outliner::Iterator(); maSearchStartPosition = ::sd::outliner::Iterator(); @@ -499,7 +499,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) meMode = SEARCH; mpSearchItem = pSearchItem; - mbFoundObject = sal_False; + mbFoundObject = false; Initialize ( ! mpSearchItem->GetBackward()); @@ -1067,7 +1067,7 @@ void Outliner::EndOfSearch (void) if ( ! mbMatchMayExist) { ShowEndOfSearchDialog (); - mbEndOfSearch = sal_True; + mbEndOfSearch = true; } // Ask the user whether to wrap arround and continue the search or // to terminate. @@ -1210,8 +1210,8 @@ void Outliner::PrepareSpellCheck (void) if (eState == EE_SPELL_NOLANGUAGE) { - mbError = sal_True; - mbEndOfSearch = sal_True; + mbError = true; + mbEndOfSearch = true; ErrorBox aErrorBox (NULL, WB_OK, SD_RESSTR(STR_NOLANGUAGE)); @@ -1269,7 +1269,7 @@ void Outliner::SetViewMode (PageKind ePageKind) if (pDrawViewShell.get()!=NULL && ePageKind != pDrawViewShell->GetPageKind()) { // Restore old edit mode. - pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, sal_False); + pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, false); SetStatusEventHdl(Link()); OUString sViewURL; @@ -1338,7 +1338,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) OSL_ASSERT(pDrawViewShell.get()!=NULL); if (pDrawViewShell.get() != NULL) { - pDrawViewShell->ChangeEditMode(eEditMode, sal_False); + pDrawViewShell->ChangeEditMode(eEditMode, false); pDrawViewShell->SwitchPage(nPageIndex); } } @@ -1378,7 +1378,7 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus) mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, sal_True, this, pOutlinerView, sal_True, sal_True, bGrabFocus); SetUpdateMode(sal_True); - mbFoundObject = sal_True; + mbFoundObject = true; } } @@ -1583,8 +1583,8 @@ void Outliner::PrepareConversion (void) if( HasConvertibleTextPortion( mnConversionLanguage ) ) { SetUpdateMode(sal_False); - mbStringFound = sal_True; - mbMatchMayExist = sal_True; + mbStringFound = true; + mbMatchMayExist = true; EnterEditMode (); @@ -1612,12 +1612,12 @@ void Outliner::BeginConversion (void) ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell) { - mbStringFound = sal_False; + mbStringFound = false; // Supposed that we are not located at the very beginning/end of the // document then there may be a match in the document prior/after // the current position. - mbMatchMayExist = sal_True; + mbMatchMayExist = true; maObjectIterator = ::sd::outliner::Iterator(); maSearchStartPosition = ::sd::outliner::Iterator(); @@ -1711,13 +1711,13 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) if (pChildWindow != NULL) pSearchDialog = pChildWindow->GetWindow(); if (pSearchDialog != NULL) - pSearchDialog->EnableInput(sal_False,sal_True); + pSearchDialog->EnableInput(false,sal_True); sal_uInt16 nResult = rMessageBox.Execute(); // Unlock the search dialog. if (pSearchDialog != NULL) - pSearchDialog->EnableInput(sal_True,sal_True); + pSearchDialog->EnableInput(true,sal_True); return nResult; } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 8c5fb7678558..e8e7319b8f09 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1060,7 +1060,7 @@ bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) co if (pMedium == NULL) break; - SFX_ITEMSET_ARG(pMedium->GetItemSet(),pViewOnlyItem,SfxBoolItem,SID_VIEWONLY,sal_False); + SFX_ITEMSET_ARG(pMedium->GetItemSet(),pViewOnlyItem,SfxBoolItem,SID_VIEWONLY,false); if (pViewOnlyItem == NULL) break; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 6895ef7cd270..02e0a918ab27 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1001,7 +1001,7 @@ OUString ViewShellBase::GetInitialViewShellType (void) // The page kind is invalid. This is probably an // error by the caller. We use the standard type to // keep things going. - DBG_ASSERT(sal_False, "ViewShellBase::GetInitialViewShellType: invalid page kind"); + DBG_ASSERT(false, "ViewShellBase::GetInitialViewShellType: invalid page kind"); sRequestedView = FrameworkHelper::msImpressViewURL; break; } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 39b2cd9630b4..203f1a57854a 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -99,8 +99,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( { SdDrawDocument* pDocument = mrViewShell.GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; sal_Bool bHandoutMode = sal_False; SdPage* pHandoutMPage = NULL; @@ -133,10 +133,10 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } else if (pArgs->Count() == 4) { - SFX_REQUEST_ARG (rRequest, pNewName, SfxStringItem, ID_VAL_PAGENAME, sal_False); - SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); - SFX_REQUEST_ARG (rRequest, pBVisible, SfxBoolItem, ID_VAL_ISPAGEBACK, sal_False); - SFX_REQUEST_ARG (rRequest, pBObjsVisible, SfxBoolItem, ID_VAL_ISPAGEOBJ, sal_False); + SFX_REQUEST_ARG (rRequest, pNewName, SfxStringItem, ID_VAL_PAGENAME, false); + SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, false); + SFX_REQUEST_ARG (rRequest, pBVisible, SfxBoolItem, ID_VAL_ISPAGEBACK, false); + SFX_REQUEST_ARG (rRequest, pBObjsVisible, SfxBoolItem, ID_VAL_ISPAGEOBJ, false); AutoLayout aLayout ((AutoLayout)pNewAutoLayout->GetValue ()); if (aLayout >= AUTOLAYOUT__START && aLayout < AUTOLAYOUT__END) @@ -204,8 +204,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( pCurrentPage->SetAutoLayout(aNewAutoLayout, sal_True); - aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); aVisibleLayers.Set(aBckgrnd, bBVisible); aVisibleLayers.Set(aBckgrndObj, bBObjsVisible); pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); @@ -239,8 +239,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ) { - const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, sal_False, TYPE(SfxUInt32Item) ) ); - const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, sal_False, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, false, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, false, TYPE(SfxUInt32Item) ) ); SdDrawDocument* pDocument = mrViewShell.GetDoc(); if( !pDocument ) @@ -265,8 +265,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP // Transform the given request into the four argument form that is // understood by ProcessModifyPageSlot(). SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); - sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False)); - sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False)); + sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false)); + sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false)); SetOfByte aVisibleLayers; diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index b088846ff453..32dffba88de2 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -93,7 +93,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { SfxItemSet aAttrSet( mpView->GetDoc().GetPool() ); mpView->GetAttributes( aAttrSet ); - rSet.Put(aAttrSet, sal_False); // <- sal_False, so DontCare-Status gets aquired + rSet.Put(aAttrSet, false); // <- sal_False, so DontCare-Status gets aquired rtl::Reference<FuPoor> xFunc( mpViewSh->GetCurrentFunction() ); @@ -102,12 +102,12 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) if(xFunc->ISA(FuSelection)) { sal_uInt16 nEditMode = static_cast<FuSelection*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, sal_True)); + rSet.Put(SfxBoolItem(nEditMode, true)); } else if (xFunc->ISA(FuConstructBezierPolygon)) { sal_uInt16 nEditMode = static_cast<FuConstructBezierPolygon*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, sal_True)); + rSet.Put(SfxBoolItem(nEditMode, true)); } } @@ -155,8 +155,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSegm) { case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break; - case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button down = curve - case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break; + case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,false)); break; // Button down = curve + case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,true)); break; default: break; } } @@ -172,9 +172,9 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSmooth) { case SDRPATHSMOOTH_DONTCARE : break; - case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, sal_True)); break; - case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,sal_True)); break; - case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,sal_True)); break; + case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, true)); break; + case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,true)); break; + case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,true)); break; } } if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible()) @@ -187,8 +187,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eClose) { case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break; - case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_False)); break; - case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_True)); break; + case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,false)); break; + case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,true)); break; default: break; } } diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index c03456716d1b..056f6f67ac4c 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -134,8 +134,8 @@ void TextObjectBar::GetCharState( SfxItemSet& rSet ) SfxItemSet aNewAttr( mpViewShell->GetPool(),EE_ITEMS_START,EE_ITEMS_END); - aNewAttr.Put(aCharAttrSet, sal_False); - rSet.Put(aNewAttr, sal_False); + aNewAttr.Put(aCharAttrSet, false); + rSet.Put(aNewAttr, false); SvxKerningItem aKern = ( (const SvxKerningItem&) aCharAttrSet.Get( EE_CHAR_KERNING ) ); //aKern.SetWhich(SID_ATTR_CHAR_KERNING); @@ -180,7 +180,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) sal_uInt16 stretchX = 100; sal_uInt16 stretchY = 100; SvxScriptSetItem aSetItem( nSlotId, GetPool() ); - aSetItem.GetItemSet().Put( aAttrSet, sal_False ); + aSetItem.GetItemSet().Put( aAttrSet, false ); sal_uInt16 nScriptType = mpView->GetScriptType(); @@ -420,7 +420,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAttrSet, sal_False ); // <- sal_False, so DontCare-Status gets aquired + rSet.Put( aAttrSet, false ); // <- sal_False, so DontCare-Status gets aquired // these are disabled in outline-mode @@ -479,16 +479,16 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) switch( eAdj ) { case SVX_ADJUST_LEFT: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); break; case SVX_ADJUST_CENTER: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); break; case SVX_ADJUST_RIGHT: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); break; case SVX_ADJUST_BLOCK: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); break; default: break; @@ -520,13 +520,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) break; case FRMDIR_HORI_LEFT_TOP: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, sal_True ) ); - rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, sal_False ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, true ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, false ) ); break; case FRMDIR_HORI_RIGHT_TOP: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, sal_False ) ); - rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, true ) ); break; // The case for the superordinate object is missing. @@ -565,13 +565,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) switch( nLineSpace ) { case 100: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, true ) ); break; case 150: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, true ) ); break; case 200: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, true ) ); break; } } @@ -581,9 +581,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } /** diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index d1328ee951f4..c661623ce509 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -148,7 +148,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { SfxItemSet aAttr( pStyleSheet->GetItemSet() ); SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) ); - aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems is not default, handle it as "holes" + aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes" const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) aAttr.Get( EE_PARA_ULSPACE ); SvxULSpaceItem* pNewItem = (SvxULSpaceItem*) rItem.Clone(); @@ -350,7 +350,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) case SID_THES: { OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 3e8337191588..146aea802730 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -155,7 +155,7 @@ void DrawViewShell::SelectionHasChanged (void) Invalidate(); //Update3DWindow(); // 3D-Controller - SfxBoolItem aItem( SID_3D_STATE, sal_True ); + SfxBoolItem aItem( SID_3D_STATE, true ); GetViewFrame()->GetDispatcher()->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 003835e1feec..f3347dde6c4a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -326,7 +326,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { // const SfxPoolItem* pItem = rReq.GetArg( SID_HYPHENATION ); // ^-- should not be used (defaults are wrong) ! - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_HYPHENATION, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_HYPHENATION, false); if( pItem ) { @@ -499,9 +499,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pWidth, SfxUInt32Item, ID_VAL_PAGEWIDTH, sal_False); - SFX_REQUEST_ARG (rReq, pHeight, SfxUInt32Item, ID_VAL_PAGEHEIGHT, sal_False); - SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, sal_False); + SFX_REQUEST_ARG (rReq, pWidth, SfxUInt32Item, ID_VAL_PAGEWIDTH, false); + SFX_REQUEST_ARG (rReq, pHeight, SfxUInt32Item, ID_VAL_PAGEHEIGHT, false); + SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, false); Size aSize (pWidth->GetValue (), pHeight->GetValue ()); @@ -523,11 +523,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 5) { - SFX_REQUEST_ARG (rReq, pLeft, SfxUInt32Item, ID_VAL_PAGELEFT, sal_False); - SFX_REQUEST_ARG (rReq, pRight, SfxUInt32Item, ID_VAL_PAGERIGHT, sal_False); - SFX_REQUEST_ARG (rReq, pUpper, SfxUInt32Item, ID_VAL_PAGETOP, sal_False); - SFX_REQUEST_ARG (rReq, pLower, SfxUInt32Item, ID_VAL_PAGEBOTTOM, sal_False); - SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, sal_False); + SFX_REQUEST_ARG (rReq, pLeft, SfxUInt32Item, ID_VAL_PAGELEFT, false); + SFX_REQUEST_ARG (rReq, pRight, SfxUInt32Item, ID_VAL_PAGERIGHT, false); + SFX_REQUEST_ARG (rReq, pUpper, SfxUInt32Item, ID_VAL_PAGETOP, false); + SFX_REQUEST_ARG (rReq, pLower, SfxUInt32Item, ID_VAL_PAGEBOTTOM, false); + SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, false); Size aEmptySize (0, 0); @@ -550,7 +550,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs && pArgs->Count () == 1 ) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, false); if (CHECK_RANGE (5, pScale->GetValue (), 3000)) { SetZoom (pScale->GetValue ()); @@ -575,7 +575,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, false); if (CHECK_RANGE (10, pScale->GetValue (), 1000)) { SetZoom (pScale->GetValue ()); @@ -875,7 +875,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { pSheet = mpActualPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); if (pSheet) - pObj->SetStyleSheet(pSheet, sal_False); + pObj->SetStyleSheet(pSheet, false); } else if(pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { @@ -1439,7 +1439,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->GetAttr( aNewAttr ); aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); - if( rLayerAdmin.GetLayer( aLayerName, sal_False ) + if( rLayerAdmin.GetLayer( aLayerName, false ) || aLayerName.isEmpty() ) { // name already exists @@ -1483,10 +1483,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } else { - SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, sal_False); - SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); - SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, sal_False); - SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, sal_False); + SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, false); + SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, false); + SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, false); + SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, false); aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); @@ -1511,7 +1511,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } mpDrawView->InsertNewLayer(aLayerName, nPrevLayer + 1); - pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); + pLayer = rLayerAdmin.GetLayer(aLayerName, false); if( pLayer ) { pLayer->SetTitle( aLayerTitle ); @@ -1546,7 +1546,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId(); OUString aLayerName = GetLayerTabControl()->GetPageText(nCurPage); - SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); + SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, false); OUString aLayerTitle = pLayer->GetTitle(); OUString aLayerDesc = pLayer->GetDescription(); @@ -1604,7 +1604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->GetAttr( aNewAttr ); aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); - if( (rLayerAdmin.GetLayer( aLayerName, sal_False ) && + if( (rLayerAdmin.GetLayer( aLayerName, false ) && aLayerName != aOldLayerName) || aLayerName.isEmpty() ) { // name already exists @@ -1639,10 +1639,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } else if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, sal_False); - SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); - SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, sal_False); - SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, sal_False); + SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, false); + SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, false); + SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, false); + SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, false); aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); @@ -1736,8 +1736,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SfxFrameItem aFrm( SID_DOCFRAME, pFrame ); SfxStringItem aReferer( SID_REFERER, aReferName ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_False ); - SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, false ); + SfxBoolItem aBrowsing( SID_BROWSE, true ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -2859,9 +2859,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt8 aLayerId; if (nSId == SID_DISPLAY_MASTER_BACKGROUND) - aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); + aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); else - aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId)); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } @@ -2889,7 +2889,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) default: { - DBG_ASSERT( 0, "Slot without function" ); + DBG_ASSERT( false, "Slot without function" ); Cancel(); rReq.Ignore (); } @@ -2929,7 +2929,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_FONT: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxFontItem, SID_ATTR_CHAR_FONT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxFontItem, SID_ATTR_CHAR_FONT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2939,7 +2939,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_FONTHEIGHT: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxFontHeightItem, SID_ATTR_CHAR_FONTHEIGHT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxFontHeightItem, SID_ATTR_CHAR_FONTHEIGHT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2950,7 +2950,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) if( rReq.GetArgs() ) { //const SvxWeightItem *pItem = (const SvxWeightItem*) rReq.GetArg( SID_ATTR_CHAR_WEIGHT, sal_False, TYPE(SvxWeightItem) ); - SFX_REQUEST_ARG( rReq, pItem, SvxWeightItem, SID_ATTR_CHAR_WEIGHT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxWeightItem, SID_ATTR_CHAR_WEIGHT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2961,7 +2961,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) if( rReq.GetArgs() ) { //const SvxPostureItem *pItem = (const SvxPostureItem*) rReq.GetArg( SID_ATTR_CHAR_POSTURE, sal_False, TYPE(SvxPostureItem) ); - SFX_REQUEST_ARG( rReq, pItem, SvxPostureItem, SID_ATTR_CHAR_POSTURE , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxPostureItem, SID_ATTR_CHAR_POSTURE , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2973,7 +2973,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) { //<<modify by wj for sym2_1873 //SFX_REQUEST_ARG( rReq, pItem, SvxTextLineItem, SID_ATTR_CHAR_UNDERLINE , sal_False ); - SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , false ); //end>> if (pItem) { @@ -2989,7 +2989,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_SHADOWED: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxShadowedItem, SID_ATTR_CHAR_SHADOWED , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxShadowedItem, SID_ATTR_CHAR_SHADOWED , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2999,7 +2999,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_STRIKEOUT: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxCrossedOutItem, SID_ATTR_CHAR_STRIKEOUT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxCrossedOutItem, SID_ATTR_CHAR_STRIKEOUT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -3009,7 +3009,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_COLOR: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxColorItem, SID_ATTR_CHAR_COLOR , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxColorItem, SID_ATTR_CHAR_COLOR , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -3019,7 +3019,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_KERNING: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxKerningItem, SID_ATTR_CHAR_KERNING , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxKerningItem, SID_ATTR_CHAR_KERNING , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -3170,7 +3170,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet) } else { - rSet.Put(SfxBoolItem(nSlotId, sal_False)); + rSet.Put(SfxBoolItem(nSlotId, false)); } break; } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 31e89a4b8e36..1f6359bdc9e7 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -129,7 +129,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) // switch page in running slide show if(SlideShow::IsRunning(GetViewShellBase()) && rReq.GetArgs()) { - SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False); + SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, false); SlideShow::GetSlideShow(GetViewShellBase())->jumpToPageNumber((sal_Int32)((pWhatPage->GetValue()-1)>>1)); } else @@ -143,8 +143,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } else if (pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False); - SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False); + SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, false); + SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, false); sal_Int32 nWhatPage = (sal_Int32)pWhatPage->GetValue (); sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue (); @@ -203,7 +203,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if( pArgs && pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False); + SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, false); if( pWhatLayer ) nCurPage = (short) pWhatLayer->GetValue (); } @@ -222,8 +222,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if ( pArgs && pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, sal_False); - SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, false); + SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, false); sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue (); if (CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT)) @@ -250,8 +250,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if ( pArgs && pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, sal_False); - SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False); + SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, false); + SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, false); sal_Int32 nWhatLayer = (sal_Int32)pWhatLayer->GetValue (); if (CHECK_RANGE (EM_PAGE, nWhatLayer, EM_MASTERPAGE)) @@ -397,7 +397,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) { if( rReq.GetArgs() ) { - SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, sal_False); + SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, false); if (pBookmark) { diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index eff3e14d70f7..24b89fa2f968 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -104,7 +104,7 @@ void DrawViewShell::DeleteActualLayer() if (QueryBox(GetActiveWindow(), WB_YES_NO, aString).Execute() == RET_YES) { - const SdrLayer* pLayer = rAdmin.GetLayer(rName, sal_False); + const SdrLayer* pLayer = rAdmin.GetLayer(rName, false); mpDrawView->DeleteLayer( pLayer->GetName() ); /* in order to redraw TabBar and Window; should be initiated later on by @@ -222,7 +222,7 @@ void DrawViewShell::StartRulerDrag ( { // #i34536# if no guide-lines are visible yet, that show them if( ! mpDrawView->IsHlplVisible()) - mpDrawView->SetHlplVisible( sal_True ); + mpDrawView->SetHlplVisible( true ); SdrHelpLineKind eKind; diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index dbefd03303af..282e73a86d77 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -71,7 +71,7 @@ void DrawViewShell::ModelHasChanged() // that the navigator also gets an up to date state GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False ); - SfxBoolItem aItem( SID_3D_STATE, sal_True ); + SfxBoolItem aItem( SID_3D_STATE, true ); GetViewFrame()->GetDispatcher()->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 14f7e6cb299b..b0131280896b 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -327,7 +327,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) { SdrPageView* pPV = mpDrawView->GetSdrPageView(); - pNewObj->SetEmptyPresObj( sal_False ); + pNewObj->SetEmptyPresObj( false ); pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( pNewObj->GetGraphic() ) ); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 340fa3f7f9c0..59819b0d9207 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -206,7 +206,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper void DrawViewShell::GetDrawAttrState(SfxItemSet& rSet) { SfxItemSet aSet( mpDrawView->GetGeoAttrFromMarked() ); - rSet.Put(aSet,sal_False); + rSet.Put(aSet,false); } void DrawViewShell::GetMenuState( SfxItemSet &rSet ) @@ -247,7 +247,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { sal_uInt16 nSId = GetCurrentFunction()->GetSlotID(); - rSet.Put( SfxBoolItem( nSId, sal_True ) ); + rSet.Put( SfxBoolItem( nSId, true ) ); // will cause a uncheck of a simulated slot sal_uInt16 nId = GetIdBySubId( nSId ); @@ -495,14 +495,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } if (!mpDrawView->IsFrameDragSingles()) - rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, sal_True)); + rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, true)); else - rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, sal_False)); + rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, false)); if(dynamic_cast<FuEditGluePoints*>( GetCurrentFunction().get())) - rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, true)); else - rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, false)); if( !mpDrawView->IsMirrorAllowed( sal_True, sal_True ) ) { @@ -556,12 +556,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if ( !mpDrawView->IsGroupEntered() ) { rSet.DisableItem( SID_LEAVE_GROUP ); - rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, sal_False ) ); + rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, false ) ); rSet.ClearItem( SID_LEAVE_ALL_GROUPS ); rSet.DisableItem( SID_LEAVE_ALL_GROUPS ); } else - rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, sal_True ) ); + rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, true ) ); if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_THESAURUS ) ) { @@ -741,11 +741,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) /********************************************************************** * page mode **********************************************************************/ - rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_PAGEMODE, true)); + rSet.Put(SfxBoolItem(SID_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false)); if (mePageKind == PK_STANDARD && rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) @@ -773,7 +773,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, false)); } } else @@ -788,17 +788,17 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_True)); + rSet.Put(SfxBoolItem(SID_PAGEMODE, false)); + rSet.Put(SfxBoolItem(SID_MASTERPAGE, true)); /********************************************************************** * Background page mode **********************************************************************/ if (mePageKind == PK_STANDARD) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_True)); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, true)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false)); if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { @@ -839,7 +839,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (bCheck) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); } rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, bCheck)); @@ -853,17 +853,17 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else if (mePageKind == PK_NOTES) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); rSet.DisableItem(SID_TITLE_MASTERPAGE); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_True)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, true)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false)); } else if (mePageKind == PK_HANDOUT) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); rSet.DisableItem(SID_TITLE_MASTERPAGE); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_True)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, true)); } } @@ -1031,7 +1031,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) nCurrentSId != SID_ATTR_CHAR_VERTICAL ) nCurrentSId = SID_ATTR_CHAR; - rSet.Put( SfxBoolItem( nCurrentSId, sal_True ) ); + rSet.Put( SfxBoolItem( nCurrentSId, true ) ); // Short version of UpdateToolboxImages() rSet.Put( TbxImageItem( SID_DRAWTBX_TEXT, nCurrentSId ) ); @@ -1045,11 +1045,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if (GetDoc()->GetOnlineSpell()) { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_True)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, true)); } else { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_False)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, false)); } } @@ -1577,8 +1577,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_BACKGROUND, aVisibleLayers.IsSet(aBackgroundId))); rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_OBJECTS, @@ -1592,25 +1592,25 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) { //draview - rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DIAMODE, false)); + rSet.Put(SfxBoolItem(SID_OUTLINEMODE, false)); if (mePageKind == PK_NOTES) { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, false)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, true)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, false)); } else if (mePageKind == PK_HANDOUT) { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, false)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, true)); } else { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, true)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, false)); } // Removed [GetDocSh()->GetCurrentFunction() ||] from the following diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 215158d51abf..39b245033f84 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -118,7 +118,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) if( pGrafObj->IsEmptyPresObj() ) { bInsertNewObject = sal_False; - pGrafObj->SetEmptyPresObj(sal_False); + pGrafObj->SetEmptyPresObj(false); pGrafObj->SetOutlinerParaObject(NULL); pGrafObj->SetGraphic( Graphic( aScanBmp ) ); } diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index e3cf6d5e48bc..ad9d93146d88 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -71,7 +71,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) const SfxItemSet* pArgs = rReq.GetArgs(); - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, sal_False ); + SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); if ( !pGalleryItem ) return; @@ -150,7 +150,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) bInsertNewObject = sal_False; SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone(); - pNewGrafObj->SetEmptyPresObj(sal_False); + pNewGrafObj->SetEmptyPresObj(false); pNewGrafObj->SetOutlinerParaObject(NULL); pNewGrafObj->SetGraphic(aGraphic); @@ -220,7 +220,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, false); if (CHECK_RANGE (XFILL_NONE, (sal_Int32)pFillStyle->GetValue (), XFILL_BITMAP)) { pAttr->ClearItem (XATTR_FILLSTYLE); @@ -242,7 +242,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, false); if (CHECK_RANGE (XLINE_NONE, (sal_Int32)pLineStyle->GetValue (), XLINE_DASH)) { pAttr->ClearItem (XATTR_LINESTYLE); @@ -264,7 +264,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, sal_False); + SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, false); pAttr->ClearItem (XATTR_LINEWIDTH); pAttr->Put (XLineWidthItem (pLineWidth->GetValue ()), XATTR_LINEWIDTH); rBindings.Invalidate (SID_ATTR_LINE_WIDTH); @@ -279,9 +279,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, false); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, false); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, false); pAttr->ClearItem (XATTR_FILLCOLOR); pAttr->ClearItem (XATTR_FILLSTYLE); @@ -303,9 +303,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, false); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, false); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, false); pAttr->ClearItem (XATTR_LINECOLOR); pAttr->Put (XLineColorItem (-1, Color ((sal_uInt8) pRed->GetValue (), @@ -325,10 +325,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, false); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, false); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, false); XGradientListRef pGradientList = GetDoc()->GetGradientList (); long nCounts = pGradientList->Count (); @@ -386,10 +386,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); - SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False); - SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False); - SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); + SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, false); + SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, false); + SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, false); XHatchListRef pHatchList = GetDoc()->GetHatchList (); long nCounts = pHatchList->Count (); @@ -441,13 +441,13 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 7) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); - SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); - SFX_REQUEST_ARG (rReq, pDots, SfxUInt32Item, ID_VAL_DOTS, sal_False); - SFX_REQUEST_ARG (rReq, pDotLen, SfxUInt32Item, ID_VAL_DOTLEN, sal_False); - SFX_REQUEST_ARG (rReq, pDashes, SfxUInt32Item, ID_VAL_DASHES, sal_False); - SFX_REQUEST_ARG (rReq, pDashLen, SfxUInt32Item, ID_VAL_DASHLEN, sal_False); - SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); + SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, false); + SFX_REQUEST_ARG (rReq, pDots, SfxUInt32Item, ID_VAL_DOTS, false); + SFX_REQUEST_ARG (rReq, pDotLen, SfxUInt32Item, ID_VAL_DOTLEN, false); + SFX_REQUEST_ARG (rReq, pDashes, SfxUInt32Item, ID_VAL_DASHES, false); + SFX_REQUEST_ARG (rReq, pDashLen, SfxUInt32Item, ID_VAL_DASHLEN, false); + SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, false); if (CHECK_RANGE (XDASH_RECT, (sal_Int32)pStyle->GetValue (), XDASH_ROUNDRELATIVE)) { @@ -491,14 +491,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 8) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); - SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); - SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, sal_False); - SFX_REQUEST_ARG (rReq, pBorder, SfxUInt32Item, ID_VAL_BORDER, sal_False); - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); - SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, sal_False); - SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); + SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, false); + SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, false); + SFX_REQUEST_ARG (rReq, pBorder, SfxUInt32Item, ID_VAL_BORDER, false); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, false); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, false); + SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, false); + SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, false); if (CHECK_RANGE (XGRAD_LINEAR, (sal_Int32)pStyle->GetValue (), XGRAD_RECT) && CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360) && @@ -568,10 +568,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); - SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); - SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, sal_False); - SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); + SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, false); + SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, false); + SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, false); if (CHECK_RANGE (XHATCH_SINGLE, (sal_Int32)pStyle->GetValue (), XHATCH_TRIPLE) && CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360)) @@ -629,7 +629,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); XGradientListRef pGradientList = GetDoc()->GetGradientList (); long nCounts = pGradientList->Count (); @@ -664,7 +664,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); XHatchListRef pHatchList = GetDoc()->GetHatchList (); long nCounts = pHatchList->Count (); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 0d48e74f6bf4..3c2daa7565d7 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -749,7 +749,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) nLayer = pObj->GetLayer(); if( j != 0 && nLayer != nOldLayer ) - bOneLayer = sal_False; + bOneLayer = false; nOldLayer = nLayer; } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 31bc8879e563..efca498a4001 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -81,8 +81,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = GetDoc()->GetLayerAdmin(); - sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND), sal_False ); - sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND), false ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false ); SetOfByte aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers(); ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); @@ -120,7 +120,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) GetDoc()->SetChanged( sal_True ); // inform navigator about change - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index bdda90a94200..f89f6e318862 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -142,7 +142,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) SfxStringItem aReferer(SID_REFERER, GetDocSh()->GetMedium()->GetName()); SfxViewFrame* pFrame = GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem(SID_BROWSE, sal_True); + SfxBoolItem aBrowseItem(SID_BROWSE, true); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 556b32328400..0c83d6c3a309 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -264,7 +264,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) case SID_FM_CREATE_FIELDCONTROL: { - SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, sal_False ); + SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, false ); DBG_ASSERT( pDescriptorItem, "DrawViewShell::FuPermanent(SID_FM_CREATE_FIELDCONTROL): invalid request args!" ); if(pDescriptorItem) @@ -807,7 +807,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( pReqArgs ) { - SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, sal_False ); + SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, false ); nFormat = pIsActive->GetValue(); } @@ -900,7 +900,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if ( pReqArgs ) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, sal_False); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, false); mbIsLayerModeActive = pIsActive->GetValue (); } @@ -1025,7 +1025,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if ( pReqArgs ) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, sal_False); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, false); SetRuler (pIsActive->GetValue ()); } else SetRuler (!HasRuler()); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 6ed5dbc46fee..4032e6fb2e01 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -201,7 +201,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) ) { - rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True ) ); + rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true ) ); } if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ATTR_YEAR2000) ) @@ -295,7 +295,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_LEFT) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); } bAttr = sal_True; @@ -312,7 +312,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_CENTER) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); } bAttr = sal_True; @@ -329,7 +329,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_RIGHT) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); } bAttr = sal_True; @@ -346,7 +346,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_BLOCK) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); } bAttr = sal_True; @@ -487,7 +487,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { ISfxTemplateCommon* pTemplateCommon = SFX_APP()->GetCurrentTemplateCommon(GetViewFrame()->GetBindings()); if (pTemplateCommon && pTemplateCommon->GetActualFamily() == SD_STYLE_FAMILY_PSEUDO) - rSet.Put(SfxBoolItem(nWhich,sal_False)); + rSet.Put(SfxBoolItem(nWhich,false)); else { SfxBoolItem aItem(nWhich, SD_MOD()->GetWaterCan()); @@ -559,7 +559,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aEditAttr ); SfxItemSet aNewAttr( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, sal_False ); + aNewAttr.Put( aEditAttr, false ); SvxNumRule* pNumRule = NULL; @@ -652,8 +652,8 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } if (bEnable) { - rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, sal_False)); - rSet.Put(SfxBoolItem(FN_NUM_NUMBERING_ON, sal_False)); + rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, false)); + rSet.Put(SfxBoolItem(FN_NUM_NUMBERING_ON, false)); } else { @@ -672,10 +672,10 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { pSet = new SfxItemSet( GetDoc()->GetPool() ); mpDrawView->GetAttributes( *pSet ); - rSet.Put( *pSet, sal_False ); + rSet.Put( *pSet, false ); } - rSet.Put( aAllSet, sal_False ); + rSet.Put( aAllSet, false ); // there were changes at area and/or line attributes if( bAttr && pSet ) @@ -720,11 +720,11 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) pSet->Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) { - rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); } else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) { - rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } eState = pSet->GetItemState( EE_CHAR_KERNING, sal_True ); diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 049eb3b131db..37ca292fe701 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -135,12 +135,12 @@ void DrawViewShell::AssignFrom3DWindow() // assign only text-attribute SfxItemSet aTextSet( GetDoc()->GetPool(), EE_ITEMS_START, EE_ITEMS_END, 0 ); - aTextSet.Put( aSet, sal_False ); + aTextSet.Put( aSet, false ); GetView()->SetAttributes( aTextSet ); // transform text into 3D sal_uInt16 nSId = SID_CONVERT_TO_3D; - SfxBoolItem aItem( nSId, sal_True ); + SfxBoolItem aItem( nSId, true ); GetViewFrame()->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 1c3ff4d7adc4..8fd8643e8bd8 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -64,8 +64,8 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * EnableExtendedMouseEventDispatcher(sal_False); EnableExtendedCommandEventDispatcher(sal_False); - SetGridFront( sal_False ); - SetHlplFront( sal_False ); + SetGridFront( false ); + SetHlplFront( false ); SetOConSnap( sal_False ); SetFrameDragSingles( sal_True ); SetSlidesPerRow(4); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 6bdb2b33656d..1f2370a6a14e 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -124,7 +124,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) if (pArgs && pArgs->Count () == 1 ) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, false); if (CHECK_RANGE (5, pScale->GetValue (), 3000)) { SetZoom (pScale->GetValue ()); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index f7842d5536af..5a7309922498 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -137,7 +137,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) Size aSize(29700, 21000); Point aWinPos (0, 0); Point aViewOrigin(0, 0); - GetActiveWindow()->SetMinZoomAutoCalc(sal_False); + GetActiveWindow()->SetMinZoomAutoCalc(false); GetActiveWindow()->SetMinZoom( MIN_ZOOM ); GetActiveWindow()->SetMaxZoom( MAX_ZOOM ); InitWindows(aViewOrigin, aSize, aWinPos); @@ -280,7 +280,7 @@ void OutlineViewShell::ArrangeGUIElements () ::sd::Window* pWindow = mpContentWindow.get(); if (pWindow != NULL) { - pWindow->SetMinZoomAutoCalc(sal_False); + pWindow->SetMinZoomAutoCalc(false); // change OuputArea of the OutlinerView @@ -420,7 +420,7 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet) rSet.Put( SfxBoolItem( SID_READONLY_MODE, GetDocSh()->IsReadOnly() ) ); if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) ) - rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True ) ); + rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true ) ); if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_HALFWIDTH) || SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_FULLWIDTH) || @@ -747,11 +747,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { ViewShell::GetMenuState(rSet); - rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DIAMODE, false)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, false)); + rSet.Put(SfxBoolItem(SID_OUTLINEMODE, true)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, false)); if (!mpZoomList->IsNextPossible()) { @@ -951,11 +951,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { if (GetDoc()->GetOnlineSpell()) { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_True)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, true)); } else { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_False)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, false)); } } @@ -1616,7 +1616,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAllSet, sal_False ); + rSet.Put( aAllSet, false ); } @@ -1695,7 +1695,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) { DBG_ASSERT( pOlView->isRecordingUndo(), "sd::OutlineViewShell::UpdateTitleObject(), no undo for model change!?" ); pTO = pOlView->CreateTitleTextObject(pPage); - bNewObject = sal_True; + bNewObject = true; } // if we have a title object and a text, set the text @@ -1716,7 +1716,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pTO->SetOutlinerParaObject( pOPO ); - pTO->SetEmptyPresObj( sal_False ); + pTO->SetEmptyPresObj( false ); pTO->ActionChanged(); } } @@ -1736,7 +1736,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) if( pOlView->isRecordingUndo() ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pPage->RestoreDefaultText( pTO ); - pTO->SetEmptyPresObj(sal_True); + pTO->SetEmptyPresObj(true); pTO->ActionChanged(); } } @@ -1821,7 +1821,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pTO->SetOutlinerParaObject( pOPO ); - pTO->SetEmptyPresObj( sal_False ); + pTO->SetEmptyPresObj( false ); pTO->ActionChanged(); } } @@ -1844,7 +1844,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( pOlView->isRecordingUndo() ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pPage->RestoreDefaultText( pTO ); - pTO->SetEmptyPresObj(sal_True); + pTO->SetEmptyPresObj(true); pTO->ActionChanged(); } } diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index cd78739dfaac..d550d5efda3b 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -444,7 +444,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) // this page is exemplary SdPage* pExample = (SdPage*)mrDoc.GetSdPage((sal_uInt16)nExample, PK_STANDARD); - SdPage* pPage = (SdPage*)mrDoc.AllocPage(sal_False); + SdPage* pPage = (SdPage*)mrDoc.AllocPage(false); pPage->SetLayoutName(pExample->GetLayoutName()); @@ -481,7 +481,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) |* now the notes page \*********************************************************************/ pExample = (SdPage*)mrDoc.GetSdPage((sal_uInt16)nExample, PK_NOTES); - SdPage* pNotesPage = (SdPage*)mrDoc.AllocPage(sal_False); + SdPage* pNotesPage = (SdPage*)mrDoc.AllocPage(false); pNotesPage->SetLayoutName(pExample->GetLayoutName()); @@ -1090,7 +1090,7 @@ sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const mrOutlineViewShell.GetActiveWindow()); DBG_ASSERT(pOlView, "keine OutlinerView gefunden"); - rTargetSet.Put( pOlView->GetAttribs(), sal_False ); + rTargetSet.Put( pOlView->GetAttribs(), false ); return sal_True; } @@ -1119,7 +1119,7 @@ void OutlineView::FillOutliner() if (pOPO) { sal_Bool bVertical = pOPO->IsVertical(); - pOPO->SetVertical( sal_False ); + pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); pPara = mrOutliner.GetParagraph( mrOutliner.GetParagraphCount()-1 ); @@ -1162,7 +1162,7 @@ void OutlineView::FillOutliner() { sal_Int32 nParaCount1 = mrOutliner.GetParagraphCount(); sal_Bool bVertical = pOPO->IsVertical(); - pOPO->SetVertical( sal_False ); + pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 1bc08e04db3d..bed8e9ed55b5 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -133,7 +133,7 @@ void PresentationViewShell::Activate( sal_Bool bIsMDIActivate ) if( bIsMDIActivate ) { - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 5483746bbe6e..4b01b7d94bd7 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -112,7 +112,7 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev, mnDragSrcPgNum(SDRPAGE_NOTFOUND), mnAction(DND_ACTION_NONE), mnLockRedrawSmph(0), - mbIsDropAllowed(sal_True), + mbIsDropAllowed(true), maSmartTags(*this), mpClipboard (new ViewClipboard (*this)) { @@ -743,7 +743,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally ) { if( xObj.is() && !xObj->IsEmptyPresObj() ) { - xObj->SetEmptyPresObj( sal_True ); + xObj->SetEmptyPresObj( true ); } else { @@ -757,7 +757,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally ) { SdrPage* pPage = pObj->GetPage(); if( !pPage || !pPage->IsMasterPage() ) - pObj->SetEmptyPresObj( sal_False ); + pObj->SetEmptyPresObj( false ); } } @@ -1237,10 +1237,10 @@ bool View::ShouldToggleOn( { // If setting bullets/numbering by the dialog, always should toggle on. if (!bBulletOnOffMode) - return sal_True; + return true; SdrModel* pSdrModel = GetModel(); if (!pSdrModel) - return sal_False; + return false; sal_Bool bToggleOn = sal_False; SdrOutliner* pOutliner = SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, pSdrModel); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index f0f21cf2e0f1..e3e4efac6ebc 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -259,7 +259,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { maDropPos = rPos; mnAction = rDnDAction; - mbIsDropAllowed = sal_False; + mbIsDropAllowed = false; TransferableDataHelper aDataHelper( rDataHelper ); SdrObject* pPickObj = NULL; @@ -501,7 +501,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, SdrEdgeObj* pCloneEdge = (SdrEdgeObj*)pRem->pClone; // test first connection - SdrObjConnection& rConn0 = pOrigEdge->GetConnection(sal_False); + SdrObjConnection& rConn0 = pOrigEdge->GetConnection(false); SdrObject* pConnObj = rConn0.GetObject(); if(pConnObj) { @@ -509,8 +509,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if(pConnClone) { // if dest obj was cloned, too, re-establish connection - pCloneEdge->ConnectToNode(sal_False, pConnClone); - pCloneEdge->GetConnection(sal_False).SetConnectorId(rConn0.GetConnectorId()); + pCloneEdge->ConnectToNode(false, pConnClone); + pCloneEdge->GetConnection(false).SetConnectorId(rConn0.GetConnectorId()); } else { @@ -533,7 +533,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } // test second connection - SdrObjConnection& rConn1 = pOrigEdge->GetConnection(sal_True); + SdrObjConnection& rConn1 = pOrigEdge->GetConnection(true); pConnObj = rConn1.GetObject(); if(pConnObj) { @@ -541,8 +541,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if(pConnClone) { // if dest obj was cloned, too, re-establish connection - pCloneEdge->ConnectToNode(sal_True, pConnClone); - pCloneEdge->GetConnection(sal_True).SetConnectorId(rConn1.GetConnectorId()); + pCloneEdge->ConnectToNode(true, pConnClone); + pCloneEdge->GetConnection(true).SetConnectorId(rConn1.GetConnectorId()); } else { @@ -1483,7 +1483,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } MarkListHasChanged(); - mbIsDropAllowed = sal_True; + mbIsDropAllowed = true; rDnDAction = mnAction; delete pImageMap; @@ -1499,7 +1499,7 @@ bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nP pModel->GetItemPool().SetDefaultMetric(SFX_MAPUNIT_100TH_MM); pModel->InsertPage(pModel->AllocPage(false)); - Reference< XComponent > xComponent( new SdXImpressDocument( pModel, sal_True ) ); + Reference< XComponent > xComponent( new SdXImpressDocument( pModel, true ) ); pModel->setUnoModel( Reference< XInterface >::query( xComponent ) ); CreateTableFromRTF( *xStm, pModel ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index bd729b51d6e4..4c5e2c575d89 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -113,15 +113,15 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, else { pNewGrafObj = new SdrGrafObj( rGraphic, pPickObj->GetSnapRect() ); - pNewGrafObj->SetEmptyPresObj(sal_True); + pNewGrafObj->SetEmptyPresObj(true); } if ( pNewGrafObj->IsEmptyPresObj() ) { Rectangle aRect( pNewGrafObj->GetLogicRect() ); - pNewGrafObj->AdjustToMaxRect( aRect, sal_False ); + pNewGrafObj->AdjustToMaxRect( aRect, false ); pNewGrafObj->SetOutlinerParaObject(NULL); - pNewGrafObj->SetEmptyPresObj(sal_False); + pNewGrafObj->SetEmptyPresObj(false); } if (pPage && pPage->IsPresObj(pPickObj)) @@ -184,7 +184,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, Size aPageSize( pPage->GetSize() ); aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); - pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), sal_True ); + pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), true ); sal_uLong nOptions = SDRINSERT_SETDEFLAYER; sal_Bool bIsPresTarget = sal_False; diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index a59efad935c0..cc5a675dfc50 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -59,8 +59,8 @@ ModifyPageUndoAction::ModifyPageUndoAction( { maOldName = mpPage->GetName(); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers = mpPage->TRG_GetMasterPageVisibleLayers(); mbOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd); @@ -107,8 +107,8 @@ void ModifyPageUndoAction::Undo() } SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, mbOldBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, mbOldBckgrndObjsVisible); @@ -151,8 +151,8 @@ void ModifyPageUndoAction::Redo() } SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, mbNewBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, mbNewBckgrndObjsVisible); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 1e7ddcd9e32e..d80b23c9e96c 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -793,7 +793,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) if ( xObj.is() ) { // OLE object is no longer empty - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(false); pObj->SetOutlinerParaObject(NULL); pObj->SetGraphic(NULL); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 3c2b5d0ae5a5..35e5751e9cf2 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -198,8 +198,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( sal_uInt16 nSId = rRequest.GetSlot(); SdDrawDocument* pDocument = GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; // Determine the page from which to copy some values, such as layers, // size, master page, to the new page. This is usually the given page. @@ -241,7 +241,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( else if (pArgs->Count() == 1) { pDocument->StopWorkStartupDelay(); - SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, false); if( pLayout ) { if (ePageKind == PK_NOTES) @@ -259,10 +259,10 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // AutoLayouts must be ready pDocument->StopWorkStartupDelay(); - SFX_REQUEST_ARG (rRequest, pPageName, SfxStringItem, ID_VAL_PAGENAME, sal_False); - SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); - SFX_REQUEST_ARG (rRequest, pIsPageBack, SfxBoolItem, ID_VAL_ISPAGEBACK, sal_False); - SFX_REQUEST_ARG (rRequest, pIsPageObj, SfxBoolItem, ID_VAL_ISPAGEOBJ, sal_False); + SFX_REQUEST_ARG (rRequest, pPageName, SfxStringItem, ID_VAL_PAGENAME, false); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, false); + SFX_REQUEST_ARG (rRequest, pIsPageBack, SfxBoolItem, ID_VAL_ISPAGEBACK, false); + SFX_REQUEST_ARG (rRequest, pIsPageObj, SfxBoolItem, ID_VAL_ISPAGEOBJ, false); if (CHECK_RANGE (AUTOLAYOUT__START, (AutoLayout) pLayout->GetValue (), AUTOLAYOUT__END)) { diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 6b19b91e4465..6a417fab4b25 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -320,7 +320,7 @@ void ViewShell::Activate(sal_Bool bIsMDIActivate) if (bIsMDIActivate) { // thus, the Navigator will also get a current status - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); if (GetDispatcher() != NULL) GetDispatcher()->Execute( SID_NAVIGATOR_INIT, |