diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-24 10:52:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-24 10:53:17 +0200 |
| commit | b45a12c37d2b671e54404afda5dee1b0947bd3ed (patch) | |
| tree | 484fa50da87e5434970c774527a77e0dd079e1b9 /sd/source/ui/view | |
| parent | e4e654e40575300eaab429a6b94348bf43b9d7ce (diff) | |
sd: sal_Bool->bool
Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea
Diffstat (limited to 'sd/source/ui/view')
44 files changed, 519 insertions, 520 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 6dc349df77f0..59106a7454e7 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -228,7 +228,7 @@ namespace { const sal_Char* pName, const bool bDefaultValue = false) const { - sal_Bool bValue = mrProperties.getBoolValue( pName, bDefaultValue ); + bool bValue = mrProperties.getBoolValue( pName, bDefaultValue ); return bValue; } @@ -1137,7 +1137,7 @@ namespace { const Rectangle aOutRect (rPrinter.GetPageOffset(), rPrinter.GetOutputSize()); Outliner* pOutliner = rDocument.GetInternalOutliner(); const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); - const sal_Bool bSavedUpdateMode (pOutliner->GetUpdateMode()); + const bool bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); @@ -1472,7 +1472,7 @@ private: // When in outline view then apply all pending changes to the model. if (pShell->ISA(OutlineViewShell)) - static_cast<OutlineViewShell*>(pShell)->PrepareClose (sal_False); + static_cast<OutlineViewShell*>(pShell)->PrepareClose (false); // Collect some frequently used data. if (mpOptions->IsDate()) @@ -1659,7 +1659,7 @@ private: Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner(); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); - const sal_Bool bSavedUpdateMode (pOutliner->GetUpdateMode()); + const bool bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); const MapMode aSavedMapMode (pOutliner->GetRefMapMode()); pOutliner->SetPaperSize(aOutRect.GetSize()); diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 8248808dbd70..e66ad9863782 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -114,14 +114,14 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - sal_Bool bEnable = sal_False; + bool bEnable = false; if( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj && pObj->ISA( SdrGrafObj ) && ( ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) ) - bEnable = sal_True; + bEnable = true; } if( !bEnable ) diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 1c7104aec8dd..d7beaabd06b4 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -180,7 +180,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) nCntrl |= EE_CNTRL_MARKFIELDS; nCntrl |= EE_CNTRL_AUTOCORRECT; - sal_Bool bOnlineSpell = false; + bool bOnlineSpell = false; DrawDocShell* pDocSh = mpDrawDocument->GetDocSh(); @@ -322,7 +322,7 @@ void Outliner::EndSpelling (void) // When in <member>PrepareSpelling()</member> a new outline view has // been created then delete it here. - sal_Bool bViewIsDrawViewShell(pViewShell && pViewShell->ISA(DrawViewShell)); + bool bViewIsDrawViewShell(pViewShell && pViewShell->ISA(DrawViewShell)); if (bViewIsDrawViewShell) { SetStatusEventHdl(Link()); @@ -351,7 +351,7 @@ void Outliner::EndSpelling (void) if(IsModified()) { if(mpView && mpView->ISA(OutlineView)) - static_cast<OutlineView*>(mpView)->PrepareClose(sal_False); + static_cast<OutlineView*>(mpView)->PrepareClose(false); if(mpDrawDocument && !mpDrawDocument->IsChanged()) mpDrawDocument->SetChanged(true); } @@ -386,7 +386,7 @@ bool Outliner::SpellNextDocument (void) else { if (mpView->ISA(OutlineView)) - ((OutlineView*)mpView)->PrepareClose(sal_False); + ((OutlineView*)mpView)->PrepareClose(false); mpDrawDocument->GetDocSh()->SetWaitCursor( true ); Initialize (true); @@ -458,7 +458,7 @@ bool Outliner::SpellNextDocument (void) */ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) { - sal_Bool bEndOfSearch = sal_True; + bool bEndOfSearch = true; mpDrawDocument->GetDocSh()->SetWaitCursor( true ); if (mbPrepareSpellingPending) @@ -1143,7 +1143,7 @@ bool Outliner::ShowWrapArroundDialog (void) if (bShowDialog) { // The question text depends on the search direction. - sal_Bool bImpress = mpDrawDocument!=NULL + bool bImpress = mpDrawDocument!=NULL && mpDrawDocument->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; sal_uInt16 nStringId; if (mbDirectionIsForward) @@ -1235,7 +1235,7 @@ void Outliner::PrepareSpellCheck (void) } } - EnterEditMode( sal_False ); + EnterEditMode( false ); } } @@ -1349,7 +1349,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) -void Outliner::EnterEditMode (sal_Bool bGrabFocus) +void Outliner::EnterEditMode (bool bGrabFocus) { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) @@ -1546,10 +1546,10 @@ void Outliner::HandleChangedSelection (void) void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ) + const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); - sal_Bool bMultiDoc = pViewShell->ISA(DrawViewShell); + bool bMultiDoc = pViewShell->ISA(DrawViewShell); meMode = TEXT_CONVERSION; mbDirectionIsForward = true; diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index f7aea48e6b83..38af3dd9eecf 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -91,7 +91,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) for ( pIter = rBookmarks.begin(); pIter != rBookmarks.end(); ++pIter ) { OUString sName (*pIter); - sal_Bool bIsMasterPage; + bool bIsMasterPage; // SdPage* GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind); // sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const; @@ -164,8 +164,8 @@ void ViewClipboard::AssignMasterPage ( pPage->GetPageNum() / 2, sLayoutName, pSourceDocument, - sal_False, // Exchange the master page of only the target page. - sal_False // Keep unused master pages. + false, // Exchange the master page of only the target page. + false // Keep unused master pages. ); } @@ -202,7 +202,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( SdDrawDocument& rDoc = mrView.GetDoc(); sal_uInt16 nInsertPgCnt = 0; - sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); + bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); // Prepare the insertion. const std::vector<OUString> *pBookmarkList = NULL; @@ -230,7 +230,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( { const SolarMutexGuard aGuard; ::sd::Window* pWin = mrView.GetViewShell()->GetActiveWindow(); - const sal_Bool bWait = pWin && pWin->IsWait(); + const bool bWait = pWin && pWin->IsWait(); if( bWait ) pWin->LeaveWait(); @@ -238,14 +238,14 @@ sal_uInt16 ViewClipboard::InsertSlides ( rDoc.InsertBookmarkAsPage( pBookmarkList ? *pBookmarkList : std::vector<OUString>(), NULL, - sal_False, - sal_False, + false, + false, nInsertPosition, (&rTransferable == SD_MOD()->pTransferDrag), pDataDocSh, - sal_True, + true, bMergeMasterPages, - sal_False); + false); if( bWait ) pWin->EnterWait(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 833c12aedf81..96c15633a346 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -585,7 +585,7 @@ sal_uInt16 ViewShellBase::SetPrinter ( pNewPrinter->SetMapMode(aMap); Size aNewSize = pNewPrinter->GetOutputSize(); - sal_Bool bScaleAll = sal_False; + bool bScaleAll = false; if ( bIsAPI ) { WarningBox aWarnBox ( @@ -1292,7 +1292,7 @@ void ViewShellBase::Implementation::SetPaneVisibility ( // Determine the new visibility state. const SfxItemSet* pArguments = rRequest.GetArgs(); - sal_Bool bShowChildWindow; + bool bShowChildWindow; sal_uInt16 nSlotId = rRequest.GetSlot(); if (pArguments != NULL) bShowChildWindow = static_cast<const SfxBoolItem&>( diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 203f1a57854a..f1111833cf22 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -102,14 +102,14 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( 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; + bool bHandoutMode = false; SdPage* pHandoutMPage = NULL; OUString aNewName; AutoLayout aNewAutoLayout; - sal_Bool bBVisible; - sal_Bool bBObjsVisible; + bool bBVisible; + bool bBObjsVisible; const SfxItemSet* pArgs = rRequest.GetArgs(); if (pCurrentPage != NULL && pCurrentPage->TRG_HasMasterPage()) @@ -156,7 +156,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } if (ePageKind == PK_HANDOUT) { - bHandoutMode = sal_True; + bHandoutMode = true; pHandoutMPage = pDocument->GetMasterSdPage(0, PK_HANDOUT); } } @@ -202,7 +202,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } } - pCurrentPage->SetAutoLayout(aNewAutoLayout, sal_True); + pCurrentPage->SetAutoLayout(aNewAutoLayout, true); aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); @@ -212,17 +212,17 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } else { - pHandoutMPage->SetAutoLayout(aNewAutoLayout, sal_True); + pHandoutMPage->SetAutoLayout(aNewAutoLayout, true); } mrViewShell.GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - sal_Bool bSetModified = sal_True; + bool bSetModified = true; if (pArgs && pArgs->Count() == 1) { - bSetModified = (sal_Bool) ((SfxBoolItem&) pArgs->Get(SID_MODIFYPAGE)).GetValue(); + bSetModified = ((SfxBoolItem&) pArgs->Get(SID_MODIFYPAGE)).GetValue(); } pUndoManager->AddUndoAction( new UndoAutoLayoutPosAndSize( *pUndoPage ) ); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 1fa6374a3ebd..af9f4de67806 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -128,10 +128,10 @@ void DrawView::ModelHasChanged() * rectangle of a masterpage into templates, otherwise pass on baseclass. */ -sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, - sal_Bool bReplaceAll) +bool DrawView::SetAttributes(const SfxItemSet& rSet, + bool bReplaceAll) { - sal_Bool bOk = sal_False; + bool bOk = false; // is there a masterpage edit? if ( mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE ) @@ -168,7 +168,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, pSheet->GetItemSet().Put(aTempSet); pSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); - bOk = sal_True; + bOk = true; } else if (eObjKind == OBJ_OUTLINETEXT) { @@ -241,7 +241,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, mpDocSh->GetUndoManager()->LeaveListAction(); - bOk = sal_True; + bOk = true; } else { @@ -281,7 +281,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, pSheet->GetItemSet().Put(aTempSet,false); pSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); - bOk = sal_True; + bOk = true; } else if (eObjKind == OBJ_OUTLINETEXT) { @@ -336,7 +336,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, nWhich = aWhichIter.NextWhich(); } - bOk = sal_True; + bOk = true; } } } @@ -395,7 +395,7 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) * Lock/Unlock PageOrderChangedHint */ -void DrawView::BlockPageOrderChangedHint(sal_Bool bBlock) +void DrawView::BlockPageOrderChangedHint(bool bBlock) { if (bBlock) mnPOCHSmph++; @@ -411,19 +411,19 @@ void DrawView::BlockPageOrderChangedHint(sal_Bool bBlock) * masterpage. */ -sal_Bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { - sal_Bool bResult = sal_True; + bool bResult = true; // is there a masterpage edit? if (mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE) { - if (IsPresObjSelected(sal_False, sal_True)) + if (IsPresObjSelected(false, true)) { InfoBox(mpDrawViewShell->GetActiveWindow(), SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); - bResult = sal_False; + bResult = false; } else { @@ -449,7 +449,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co mpVDev = NULL; } - sal_Bool bStandardPaint = sal_True; + bool bStandardPaint = true; SdDrawDocument* pDoc = mpDocShell->GetDoc(); if( pDoc && pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) @@ -462,7 +462,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co { if( pShowWindow == pOutDev ) PresPaint(rReg); - bStandardPaint = sal_False; + bStandardPaint = false; } } } diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 13b1def5845b..73852d01f7ac 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -155,8 +155,8 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) sal_uInt16 nWhich = aIter.FirstWhich(); SfxItemSet aAttrSet( mpView->GetDoc().GetPool() ); SvtLanguageOptions aLangOpt; - sal_Bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); - sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); + bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); mpView->GetAttributes( aAttrSet ); @@ -249,10 +249,10 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case SID_OUTLINE_UP: case SID_OUTLINE_DOWN: { - sal_Bool bDisableLeft = sal_True; - sal_Bool bDisableRight = sal_True; - sal_Bool bDisableUp = sal_True; - sal_Bool bDisableDown = sal_True; + bool bDisableLeft = true; + bool bDisableRight = true; + bool bDisableUp = true; + bool bDisableDown = true; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); if (mpView->ISA(OutlineView)) @@ -261,7 +261,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) mpViewShell->GetActiveWindow()); } - sal_Bool bOutlineViewSh = mpViewShell->ISA(OutlineViewShell); + bool bOutlineViewSh = mpViewShell->ISA(OutlineViewShell); if (pOLV && ( pOLV->GetOutliner()->GetMode() == OUTLINERMODE_OUTLINEOBJECT || bOutlineViewSh ) ) @@ -274,7 +274,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) Paragraph* pPara = aSelList.empty() ? NULL : *(aSelList.begin()); // find out if we are a OutlineView - sal_Bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); + bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); // This is ONLY for OutlineViews if(bIsOutlineView) @@ -284,7 +284,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if(pOutl->GetAbsPos(pPara) > 1 || ( pOutl->HasParaFlag(pPara,PARAFLAG_ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) ) { // not at top - bDisableUp = sal_False; + bDisableUp = false; } } else @@ -293,7 +293,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if(pOutl->GetAbsPos(pPara) > 0) { // not at top - bDisableUp = sal_False; + bDisableUp = false; } } @@ -306,14 +306,14 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if (nDepth > 0 || (bOutlineViewSh && (nDepth <= 0) && !pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE )) ) { // not minimum depth - bDisableLeft = sal_False; + bDisableLeft = false; } if( (nDepth < pOLV->GetOutliner()->GetMaxDepth() && ( !bOutlineViewSh || pOutl->GetAbsPos(pPara) != 0 )) || (bOutlineViewSh && (nDepth <= 0) && pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) && pOutl->GetAbsPos(pPara) != 0) ) { // not maximum depth and not at top - bDisableRight = sal_False; + bDisableRight = false; } } @@ -321,7 +321,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) ( pOutl->GetParagraphCount() > 1 || !bOutlineViewSh) ) { // not last paragraph - bDisableDown = sal_False; + bDisableDown = false; } // disable when first para and 2nd is not a title @@ -334,7 +334,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) && !pOutl->HasParaFlag( pOutl->GetParagraph(1), PARAFLAG_ISPAGE ) ) { // Needs to be disabled - bDisableDown = sal_True; + bDisableDown = true; } } @@ -359,13 +359,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) } else { - sal_Bool bLeftToRight = sal_True; + bool bLeftToRight = true; SdrOutliner* pOutl = mpView->GetTextEditOutliner(); if( pOutl ) { if( pOutl->IsVertical() ) - bLeftToRight = sal_False; + bLeftToRight = false; } else bLeftToRight = ( (const SvxWritingModeItem&) aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; @@ -374,7 +374,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); if( !bLeftToRight ) - bDisableParagraphTextDirection = sal_True; + bDisableParagraphTextDirection = true; } } break; @@ -532,12 +532,12 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { SdDrawDocument& rDoc = mpView->GetDoc(); ::com::sun::star::text::WritingMode eMode = rDoc.GetDefaultWritingMode(); - sal_Bool bIsLeftToRight(sal_False); + bool bIsLeftToRight(false); if(::com::sun::star::text::WritingMode_LR_TB == eMode || ::com::sun::star::text::WritingMode_TB_RL == eMode) { - bIsLeftToRight = sal_True; + bIsLeftToRight = true; } rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, bIsLeftToRight ) ); diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 9008f55f840f..322e7563d7b3 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -541,7 +541,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) else if ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT || nSlot == SID_ATTR_PARA_RIGHT_TO_LEFT ) { - sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; + bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; sal_uInt16 nAdjust = SVX_ADJUST_LEFT; if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) ) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 55c6fcc3fd3b..6ceeca8a4cb3 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -257,7 +257,7 @@ void DrawViewShell::SelectionHasChanged (void) // Invalidate for every subshell GetViewShellBase().GetViewShellManager()->InvalidateAllSubShells(this); - mpDrawView->UpdateSelectionClipboard( sal_False ); + mpDrawView->UpdateSelectionClipboard( false ); GetViewShellBase().GetDrawController().FireSelectionChangeListener(); } @@ -269,7 +269,7 @@ void DrawViewShell::SetZoom( long nZoom ) { // Make sure that the zoom factor will not be recalculated on // following window resizings. - mbZoomOnPage = sal_False; + mbZoomOnPage = false; ViewShell::SetZoom( nZoom ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); @@ -293,7 +293,7 @@ void DrawViewShell::SetZoomRect( const Rectangle& rZoomRect ) * discover an refreshed text objext. */ -bool DrawViewShell::PrepareClose( sal_Bool bUI ) +bool DrawViewShell::PrepareClose( bool bUI ) { if ( !ViewShell::PrepareClose(bUI) ) return false; @@ -481,7 +481,7 @@ bool DrawViewShell::IsLayerModeActive (void) const * Generate horizontal ruler */ -SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, sal_Bool bIsFirst) +SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, bool bIsFirst) { Ruler* pRuler; WinBits aWBits; @@ -733,9 +733,9 @@ ErrCode DrawViewShell::DoVerb(long nVerb) * Activate OLE-object */ -sal_Bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) +bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { - sal_Bool bActivated = sal_False; + bool bActivated = false; if ( !GetDocSh()->IsUIActive() ) { @@ -759,7 +759,7 @@ sal_Bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) void LclResetFlag (bool& rbFlag) {rbFlag = false;} -sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) +bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { /** Under some circumstances there are nested calls to SwitchPage() and may crash the application (activation of form controls when the @@ -768,7 +768,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) would jump to the wrong page anyway.) */ if (mbIsInSwitchPage) - return sal_False; + return false; mbIsInSwitchPage = true; comphelper::ScopeGuard aGuard (::boost::bind(LclResetFlag, ::boost::ref(mbIsInSwitchPage))); @@ -780,10 +780,10 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) ::std::mem_fun(&DrawViewShell::SwitchPage), this, nSelectedPage)); - return sal_False; + return false; } - sal_Bool bOK = sal_False; + bool bOK = false; // With the current implementation of FuSlideShow there is a problem // when it dsplays the show in a window: When the show is stopped it @@ -812,7 +812,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { ModifyGuard aGuard2( GetDoc() ); - bOK = sal_True; + bOK = true; if (mpActualPage) { @@ -835,7 +835,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) && sPageText == maTabControl.GetPageText(nSelectedPage+1)) { // this slide is already visible - return sal_True; + return true; } } } @@ -857,7 +857,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) && maTabControl.GetPageText(nSelectedPage+1).equals(pNewPage->GetName())) { // this slide is already visible - return sal_True; + return true; } } } @@ -906,7 +906,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) for (sal_uInt16 i = 0; i < GetDoc()->GetSdPageCount(mePageKind); i++) { // deselect all pages - GetDoc()->SetSelected( GetDoc()->GetSdPage(i, mePageKind), sal_False); + GetDoc()->SetSelected( GetDoc()->GetSdPage(i, mePageKind), false); } if (!mpActualPage) @@ -917,7 +917,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) // also select this page (mpActualPage always points at a drawing page, // never at a masterpage) - GetDoc()->SetSelected(mpActualPage, sal_True); + GetDoc()->SetSelected(mpActualPage, true); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetDoc() ) ); if( !xSlideshow.is() || !xSlideshow->isRunning() || ( xSlideshow->getAnimationMode() != ANIMATIONMODE_SHOW ) ) @@ -934,7 +934,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) /********************************************************************** * PAGEMODE **********************************************************************/ - GetDoc()->SetSelected(mpActualPage, sal_True); + GetDoc()->SetSelected(mpActualPage, true); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); @@ -1110,7 +1110,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) * Check if page change is allowed */ -sal_Bool DrawViewShell::IsSwitchPageAllowed() const +bool DrawViewShell::IsSwitchPageAllowed() const { bool bOK = true; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index f6a0f293de8a..7a6c14f7c935 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -331,7 +331,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pItem ) { SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); + bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -339,7 +339,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { OSL_FAIL(" no value for hyphenation!"); SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - sal_Bool bValue = sal_True; + bool bValue = true; aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -379,7 +379,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // Create shapes for the default layout. SdPage* pMasterPage = GetDoc()->GetMasterSdPage( nIndex, PK_STANDARD); - pMasterPage->CreateTitleAndLayout (sal_True,sal_True); + pMasterPage->CreateTitleAndLayout (true,true); } } @@ -505,7 +505,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) Size aSize (pWidth->GetValue (), pHeight->GetValue ()); - SetupPage (aSize, 0, 0, 0, 0, sal_True, sal_False, pScaleAll->GetValue ()); + SetupPage (aSize, 0, 0, 0, 0, true, false, pScaleAll->GetValue ()); rReq.Ignore (); break; } @@ -533,7 +533,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SetupPage (aEmptySize, pLeft->GetValue (), pRight->GetValue (), pUpper->GetValue (), pLower->GetValue (), - sal_False, sal_True, pScaleAll->GetValue ()); + false, true, pScaleAll->GetValue ()); rReq.Ignore (); break; } @@ -602,7 +602,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_ZOOM: { const SfxItemSet* pArgs = rReq.GetArgs(); - mbZoomOnPage = sal_False; + mbZoomOnPage = false; if ( pArgs ) { @@ -834,7 +834,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } pSet = new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - mpDrawView->SetAttributes( *pSet, sal_True ); + mpDrawView->SetAttributes( *pSet, true ); } else { @@ -862,7 +862,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } pSet = new SfxItemSet( GetPool() ); - mpDrawView->SetAttributes( *pSet, sal_True ); + mpDrawView->SetAttributes( *pSet, true ); sal_uLong j = 0; @@ -933,7 +933,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) FuPoor::HITPIX, 0 ) ).Width(); sal_uInt16 nHelpLine; - mbMousePosFreezed = sal_False; + mbMousePosFreezed = false; if( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) ) { @@ -1180,7 +1180,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_COPYOBJECTS: { - if ( mpDrawView->IsPresObjSelected(sal_False, sal_True) ) + if ( mpDrawView->IsPresObjSelected(false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); @@ -1223,7 +1223,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ZOOM_OUT: case SID_ZOOM_PANNING: { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) ); // finishes itself, no Cancel() needed! Invalidate( SID_ZOOM_TOOLBOX ); @@ -1317,7 +1317,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CONNECTION_NEW_ROUTING: { SfxItemSet aDefAttr( GetPool(), SDRATTR_EDGELINE1DELTA, SDRATTR_EDGELINE3DELTA ); - GetView()->SetAttributes( aDefAttr, sal_True ); // (ReplaceAll) + GetView()->SetAttributes( aDefAttr, true ); // (ReplaceAll) Cancel(); rReq.Done(); @@ -1351,7 +1351,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_TWAIN_TRANSFER: { - sal_Bool bDone = sal_False; + bool bDone = false; if( mxScannerManager.is() ) { @@ -1362,7 +1362,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( aContexts.getLength() ) { mxScannerManager->startScan( aContexts.getConstArray()[ 0 ], mxScannerListener ); - bDone = sal_True; + bDone = true; } } catch( ... ) @@ -1419,9 +1419,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) sal_uInt16 nLayer = nLayerCnt - 2 + 1; OUString aLayerName = SD_RESSTR(STR_LAYER) + OUString::number(nLayer); OUString aLayerTitle, aLayerDesc; - sal_Bool bIsVisible = sal_False; - sal_Bool bIsLocked = sal_False; - sal_Bool bIsPrintable = sal_False; + bool bIsVisible = false; + bool bIsLocked = false; + bool bIsPrintable = false; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1444,7 +1444,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() ); // test for already existing names - sal_Bool bLoop = sal_True; + bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetAttr( aNewAttr ); @@ -1461,7 +1461,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = sal_False; + bLoop = false; } if( bLoop ) // was canceled { @@ -1574,10 +1574,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) OUString aOldLayerTitle(aLayerTitle); OUString aOldLayerDesc(aLayerDesc); - sal_Bool bIsVisible, bIsLocked, bIsPrintable; - sal_Bool bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); - sal_Bool bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); - sal_Bool bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); + bool bIsVisible, bIsLocked, bIsPrintable; + bool bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); + bool bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); + bool bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1616,7 +1616,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() ); // test for already existing names - sal_Bool bLoop = sal_True; + bool bLoop = true; sal_uInt16 nRet = 0; while( bLoop && ( (nRet = pDlg->Execute()) == RET_OK ) ) { @@ -1634,7 +1634,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = sal_False; + bLoop = false; } switch (nRet) { @@ -1971,7 +1971,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // it is necessary to split the actions here SvxFieldData* pField = pDlg->GetField(); ESelection aSel = pOLV->GetSelection(); - sal_Bool bSelectionWasModified(sal_False); + bool bSelectionWasModified(false); if( pField ) { @@ -1979,7 +1979,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( aSel.nStartPos == aSel.nEndPos ) { - bSelectionWasModified = sal_True; + bSelectionWasModified = true; aSel.nEndPos++; pOLV->SetSelection( aSel ); } @@ -2041,7 +2041,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_GROUP: // BASIC { - if ( mpDrawView->IsPresObjSelected( sal_True, sal_True, sal_True ) ) + if ( mpDrawView->IsPresObjSelected( true, true, true ) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); @@ -3170,7 +3170,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet) case SID_TABLE_VERT_NONE: case SID_TABLE_VERT_CENTER: case SID_TABLE_VERT_BOTTOM: - sal_Bool bContour = sal_False; + bool bContour = false; SfxItemState eConState = aAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ); if( eConState != SFX_ITEM_DONTCARE ) { @@ -3185,7 +3185,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet) if(SFX_ITEM_DONTCARE != eVState) { SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)aAttrs.Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); - sal_Bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) || + bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) || (nSlotId == SID_TABLE_VERT_CENTER && eTVA == SDRTEXTVERTADJUST_CENTER) || (nSlotId == SID_TABLE_VERT_BOTTOM && eTVA == SDRTEXTVERTADJUST_BOTTOM); rSet.Put(SfxBoolItem(nSlotId, bSet)); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 9b076ed89541..885011dca050 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -894,7 +894,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) maMarkRect = mpDrawView->GetAllMarkedRect(); - const sal_Bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; + const bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, bRTL)); if( mpDrawView->AreObjectsMarked() ) diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 14cffd325869..8289adeba1b4 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -124,9 +124,9 @@ void DrawViewShell::DeleteActualLayer() -sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) +bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !IsInputLocked() || ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE ) ) { @@ -151,7 +151,7 @@ sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) // look for a new candidate, a successor of pOldObj SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS); - sal_Bool bDidVisitOldObject(sal_False); + bool bDidVisitOldObject(false); while(aIter.IsMore() && !pCandidate) { @@ -171,7 +171,7 @@ sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) if(pObj == pOldObj) { - bDidVisitOldObject = sal_True; + bDidVisitOldObject = true; } } } @@ -222,7 +222,7 @@ void DrawViewShell::StartRulerDrag ( if ( rRuler.GetExtraRect().IsInside(rMEvt.GetPosPixel()) ) { mpDrawView->BegSetPageOrg(aWPos); - mbIsRulerDrag = sal_True; + mbIsRulerDrag = true; } else { @@ -240,7 +240,7 @@ void DrawViewShell::StartRulerDrag ( eKind = SDRHELPLINE_VERTICAL; mpDrawView->BegDragHelpLine(aWPos, eKind); - mbIsRulerDrag = sal_True; + mbIsRulerDrag = true; } } @@ -280,7 +280,7 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt, // the contex menu is closed by VCL asynchronously which in the end // would work on deleted objects or the context menu has no parent anymore) SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && PopupMenu::IsInExecute() ) return; @@ -309,7 +309,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) if ( !aOutputArea.IsInside(rMEvt.GetPosPixel()) ) { - sal_Bool bInsideOtherWindow = sal_False; + bool bInsideOtherWindow = false; if (mpContentWindow.get() != NULL) { @@ -318,7 +318,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) Point aPos = mpContentWindow->GetPointerPosPixel(); if ( aOutputArea.IsInside(aPos) ) - bInsideOtherWindow = sal_True; + bInsideOtherWindow = true; } if (! GetActiveWindow()->HasFocus ()) @@ -439,7 +439,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) } GetActiveWindow()->ReleaseMouse(); - mbIsRulerDrag = sal_False; + mbIsRulerDrag = false; } else ViewShell::MouseButtonUp(rMEvt, pWin); @@ -457,7 +457,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // deactivate the inplace client without any problem regarding parent // windows and code on the stack. SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )) { // Deactivate OLE object @@ -485,7 +485,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if( GetActiveWindow() ) aPos = GetActiveWindow()->PixelToLogic( rCEvt.GetMousePosPixel() ); - if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, sal_False ) ) + if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, false ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -505,7 +505,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) pWin != NULL && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() ) { sal_uInt16 nSdResId = 0; // ResourceID for popup menu - sal_Bool bGraphicShell = this->ISA(GraphicViewShell); + bool bGraphicShell = this->ISA(GraphicViewShell); // is there a snap object under the cursor? SdrPageView* pPV; @@ -564,10 +564,10 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD ); // select field, so that it will be deleted on insert ESelection aSel = pOLV->GetSelection(); - sal_Bool bSel = sal_True; + bool bSel = true; if( aSel.nStartPos == aSel.nEndPos ) { - bSel = sal_False; + bSel = false; aSel.nEndPos++; } pOLV->SetSelection( aSel ); @@ -794,7 +794,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) //open context menu at that point GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId),GetActiveWindow(),&aMenuPos); } - mbMousePosFreezed = sal_False; + mbMousePosFreezed = false; } } else diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index ea3623b578d9..2e98ec506d2b 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -127,11 +127,11 @@ void DrawViewShell::ArrangeGUIElements (void) OSL_ASSERT (GetViewShell()!=NULL); Client* pIPClient = static_cast<Client*>(GetViewShell()->GetIPClient()); - sal_Bool bClientActive = sal_False; + bool bClientActive = false; if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) - bClientActive = sal_True; + bClientActive = true; - sal_Bool bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); + bool bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); if ( mbZoomOnPage && !bInPlaceActive && !bClientActive ) { @@ -235,7 +235,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) if (mpDrawView->IsSolidDragging() != pView->IsSolidDragging() ) mpDrawView->SetSolidDragging( pView->IsSolidDragging() ); - if ((mpDrawView->IsQuickTextEditMode() ? 1 : 0) != pView->IsQuickEdit()) + if (mpDrawView->IsQuickTextEditMode() != pView->IsQuickEdit()) mpDrawView->SetQuickTextEditMode( pView->IsQuickEdit() ); // #i26631# @@ -288,7 +288,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) } EditMode eNewEditMode = pView->GetViewShEditMode(mePageKind); - sal_Bool bNewLayerMode = pView->IsLayerMode(); + bool bNewLayerMode = pView->IsLayerMode(); if(IsLayerModeActive() && bNewLayerMode) { @@ -456,7 +456,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) { ViewShell::SetZoomFactor(rZoomX, rZoomY); - mbZoomOnPage = sal_False; + mbZoomOnPage = false; Point aOrigin = GetActiveWindow()->GetViewOrigin(); GetActiveWindow()->SetWinViewPos(aOrigin); } @@ -471,7 +471,7 @@ void DrawViewShell::HidePage() -void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -480,10 +480,10 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < :: const sal_Int32 nIndex = rSequence.getLength(); rSequence.realloc( nIndex + 1 ); rSequence[nIndex].Name = sUNO_View_ZoomOnPage ; - rSequence[nIndex].Value <<= (sal_Bool)mbZoomOnPage; + rSequence[nIndex].Value <<= mbZoomOnPage; } -void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -495,7 +495,7 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence { if ( pValue->Name == sUNO_View_ZoomOnPage ) { - sal_Bool bZoomPage = sal_False; + bool bZoomPage = false; if( pValue->Value >>= bZoomPage ) { mbZoomOnPage = bZoomPage; diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 723bb2d4cec9..04b83a16764a 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -354,7 +354,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrObject* pObj = NULL; sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId(); - sal_Bool bEnable = sal_False; + bool bEnable = false; if ( GetViewFrame()->HasChildWindow( nId ) ) { @@ -372,7 +372,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) !((SdrGrafObj*) pObj)->IsEPS() && !mpDrawView->IsTextEdit() ) { - bEnable = sal_True; + bEnable = true; } // put value diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 651a37774bcc..749a0cb07889 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -220,7 +220,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } ViewShell::GetMenuState(rSet); - sal_Bool bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); + bool bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); if ( bDisableVerticalText ) { @@ -242,7 +242,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SetChildWindowState( rSet ); // map images of toolboxes (only zoom) - UpdateToolboxImages( rSet, sal_False ); + UpdateToolboxImages( rSet, false ); if(HasCurrentFunction()) { @@ -393,7 +393,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); for( sal_uInt16 i = 0; i < nCount && bDisable; i++ ) @@ -401,7 +401,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD); if( !pPage->IsExcluded() ) - bDisable = sal_False; + bDisable = false; } if( bDisable || GetDocSh()->IsPreview()) @@ -622,7 +622,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) mbPastePossible = ( aDataHelper.GetFormatCount() != 0 ); } else - mbPastePossible = sal_False; + mbPastePossible = false; } if( !mbPastePossible ) @@ -754,7 +754,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { // Is there a page with the AutoLayout "Title"? - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); @@ -764,7 +764,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bDisable = sal_False; + bDisable = false; } i++; @@ -805,8 +805,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { - sal_Bool bCheck = sal_False; - sal_Bool bDisable = sal_True; + bool bCheck = false; + bool bDisable = true; if( pPageView ) { SdPage* pMPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); @@ -824,7 +824,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { // a page does have a AutoLayout "Title" - bDisable = sal_False; + bDisable = false; SdPage& rRefMPage = (SdPage&)(pPage->TRG_GetMasterPage()); @@ -832,7 +832,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { // a page with the AutoLayout "Title" does reference // the current master page - bCheck = sal_True; + bCheck = true; } } @@ -926,8 +926,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // special treatment of for SID_OUTLINE_BULLET if objects with different // kinds of NumBullets are marked - sal_Bool bHasOutliner = sal_False; - sal_Bool bHasOther = sal_False; + bool bHasOutliner = false; + bool bHasOther = false; for(sal_uLong nNum = 0; nNum < nMarkCount; nNum++) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); @@ -935,13 +935,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if( pObj->GetObjIdentifier() == OBJ_OUTLINETEXT ) { - bHasOutliner = sal_True; + bHasOutliner = true; if(bHasOther) break; } else { - bHasOther = sal_True; + bHasOther = true; if(bHasOutliner) break; } @@ -1393,12 +1393,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // get marklist SdrMarkList aMarkList = mpDrawView->GetMarkedObjectList(); - sal_Bool bFoundBitmap = sal_False; - sal_Bool bFoundMetafile = sal_False; - sal_Bool bFoundObjNoLine = sal_False; - sal_Bool bFoundObjNoArea = sal_False; - sal_Bool bFoundNoGraphicObj = sal_False; - sal_Bool bFoundAny = sal_False; + bool bFoundBitmap = false; + bool bFoundMetafile = false; + bool bFoundObjNoLine = false; + bool bFoundObjNoArea = false; + bool bFoundNoGraphicObj = false; + bool bFoundAny = false; bool bFoundTable = false; // const int nMarkCount = (int) aMarkList.GetMarkCount(); @@ -1419,8 +1419,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) case OBJ_FREELINE : case OBJ_EDGE: case OBJ_CARC : - bFoundObjNoArea = sal_True; - bFoundNoGraphicObj = sal_True; + bFoundObjNoArea = true; + bFoundNoGraphicObj = true; break; case OBJ_OLE2 : // #i118485# #i118525# Allow Line, Area and Graphic (Metafile, Bitmap) @@ -1435,14 +1435,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) switch(pSdrGrafObj->GetGraphicType()) { case GRAPHIC_BITMAP : - bFoundBitmap = sal_True; + bFoundBitmap = true; if(pSdrGrafObj->isEmbeddedSvg()) { bFoundMetafile = true; } break; case GRAPHIC_GDIMETAFILE : - bFoundMetafile = sal_True; + bFoundMetafile = true; break; default: break; @@ -1453,13 +1453,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) bFoundTable = true; break; default : - bFoundAny = sal_True; + bFoundAny = true; } } else if(nInv == E3dInventor) { // 3D objects - bFoundAny = sal_True; + bFoundAny = true; } } @@ -1498,7 +1498,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // Menuoption: Edit->Hyperlink // Disable, if there is no hyperlink - sal_Bool bDisableEditHyperlink = sal_True; + bool bDisableEditHyperlink = true; if( mpDrawView->AreObjectsMarked() && ( mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 ) ) { if( mpDrawView->IsTextEdit() ) @@ -1514,7 +1514,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { const SvxFieldData* pField = pFieldItem->GetField(); if ( pField->ISA(SvxURLField) ) - bDisableEditHyperlink = sal_False; + bDisableEditHyperlink = false; } } } @@ -1534,7 +1534,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo() ); if( xPropInfo.is() && xPropInfo->hasPropertyByName( "TargetURL") ) { - bDisableEditHyperlink = sal_False; + bDisableEditHyperlink = false; } } } diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 39b245033f84..70b858c2b118 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -100,7 +100,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) aPnt += Point( pPage->GetLftBorder(), pPage->GetUppBorder() ); Rectangle aRect( aPnt, aBmpSize ); SdrGrafObj* pGrafObj = NULL; - sal_Bool bInsertNewObject = sal_True; + bool bInsertNewObject = true; if( GetView()->AreObjectsMarked() ) { @@ -117,7 +117,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) if( pGrafObj->IsEmptyPresObj() ) { - bInsertNewObject = sal_False; + bInsertNewObject = 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 597a3dd22adf..1d3c7986731d 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -128,7 +128,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) SdrGrafObj* pGrafObj = NULL; - sal_Bool bInsertNewObject = sal_True; + bool bInsertNewObject = true; if ( mpDrawView->AreObjectsMarked() ) { @@ -147,7 +147,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) if( pGrafObj->IsEmptyPresObj() ) { // the empty graphic object gets a new graphic - bInsertNewObject = sal_False; + bInsertNewObject = false; SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone(); pNewGrafObj->SetEmptyPresObj(false); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index e76c243e8841..5cc9d321aac1 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -77,7 +77,7 @@ using sfx2::sidebar::EnumContext; namespace sd { -sal_Bool DrawViewShell::mbPipette = sal_False; +bool DrawViewShell::mbPipette = false; // - ScannerEventListener - @@ -179,11 +179,11 @@ DrawViewShell::~DrawViewShell() if (pPage == mpActualPage) { - GetDoc()->SetSelected(pPage, sal_True); + GetDoc()->SetSelected(pPage, true); } else { - GetDoc()->SetSelected(pPage, sal_False); + GetDoc()->SetSelected(pPage, false); } } @@ -209,11 +209,11 @@ DrawViewShell::~DrawViewShell() void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) { mpActualPage = 0; - mbMousePosFreezed = sal_False; + mbMousePosFreezed = false; mbReadOnly = GetDocSh()->IsReadOnly(); mpSlotArray = 0; mpClipEvtLstnr = 0; - mbPastePossible = sal_False; + mbPastePossible = false; mbIsLayerModeActive = false; mpFrameView->Connect(); @@ -355,14 +355,14 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if (pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED) { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; } else { - mbZoomOnPage = sal_True; + mbZoomOnPage = true; } - mbIsRulerDrag = sal_False; + mbIsRulerDrag = false; OUString aName( "DrawViewShell" ); SetName (aName); @@ -478,9 +478,9 @@ void DrawViewShell::SetupPage (Size &rSize, long nRight, long nUpper, long nLower, - sal_Bool bSize, - sal_Bool bMargin, - sal_Bool bScaleAll) + bool bSize, + bool bMargin, + bool bScaleAll) { sal_uInt16 nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); sal_uInt16 i; @@ -552,7 +552,7 @@ void DrawViewShell::SetupPage (Size &rSize, if ( mePageKind == PK_STANDARD ) { SdPage* pHandoutPage = GetDoc()->GetSdPage(0, PK_HANDOUT); - pHandoutPage->CreateTitleAndLayout(sal_True); + pHandoutPage->CreateTitleAndLayout(true); } long nWidth = mpActualPage->GetSize().Width(); @@ -561,7 +561,7 @@ void DrawViewShell::SetupPage (Size &rSize, Point aPageOrg(nWidth, nHeight / 2); Size aSize( nWidth * 3, nHeight * 2); - InitWindows(aPageOrg, aSize, Point(-1, -1), sal_True); + InitWindows(aPageOrg, aSize, Point(-1, -1), true); Point aVisAreaPos; @@ -796,7 +796,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) } // Turn on design mode when document is not read-only. - if ((GetDocSh()->IsReadOnly() ? 1 : 0) != mbReadOnly ) + if (GetDocSh()->IsReadOnly() != mbReadOnly ) { mbReadOnly = GetDocSh()->IsReadOnly(); diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index eeb5b7dcb3e8..cc6383e7215b 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -67,7 +67,7 @@ namespace sd { bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) { - sal_Bool bOutDummy; + bool bOutDummy; if( GetDoc()->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) return false; diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 1d38edc577ff..7b3094b15cc4 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -264,7 +264,7 @@ void DrawViewShell::MapSlot( sal_uInt16 nSId ) /** * Allows a ImageMapping via SlotArray */ -void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent ) +void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent ) { if( !bPermanent ) { diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index f89f6e318862..6ae24c353b78 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -166,7 +166,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) sal_uInt16 nCurrentPage = 0; sal_uInt16 nFirstPage = 0; sal_uInt16 nLastPage; - sal_Bool bEndless = sal_False; + bool bEndless = false; OUString aPageName; rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index fa2ef547b534..cd643b026980 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -156,7 +156,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if( pFuText ) { - pFuText->SetPermanent(sal_True); + pFuText->SetPermanent(true); xFunc->ReceiveRequest( rReq ); MapSlot( nSId ); @@ -176,7 +176,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) CheckLineTo (rReq); sal_uInt16 nOldSId = 0; - sal_Bool bPermanent = sal_False; + bool bPermanent = false; if( !mpDrawView ) return; @@ -214,7 +214,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) (nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE || nSId == SID_ATTR_CHAR_VERTICAL || nSId == SID_TEXT_FITTOSIZE_VERTICAL ))) { - bPermanent = sal_True; + bPermanent = true; } GetCurrentFunction()->Deactivate(); @@ -348,13 +348,13 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) sal_uLong i = 0; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); sal_uLong nMarkCnt = rMarkList.GetMarkCount(); - sal_Bool b3DObjMarked = sal_False; + bool b3DObjMarked = false; while (i < nMarkCnt && !b3DObjMarked) { if (rMarkList.GetMark(i)->GetMarkedSdrObj()->ISA(E3dObject)) { - b3DObjMarked = sal_True; + b3DObjMarked = true; } else { @@ -739,7 +739,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_CUT: { - if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) + if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); @@ -761,7 +761,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_COPY: { - if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) + if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); @@ -814,7 +814,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) { mpDrawView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, sal_False, FORMAT_STRING); + nAction, false, FORMAT_STRING); } } @@ -842,7 +842,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( !mpDrawView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, sal_False, nFormat ) ) + nAction, false, nFormat ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -873,7 +873,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) pOLV->PostKeyEvent(aKEvt); } } - else if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) + else if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); @@ -941,7 +941,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) nSId == SID_SLIDE_MASTERPAGE) { // Is there a page with the AutoLayout "Title"? - sal_Bool bFound = sal_False; + bool bFound = false; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); @@ -951,12 +951,12 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (nSId == SID_TITLE_MASTERPAGE && pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bFound = sal_True; + bFound = true; SwitchPage((pPage->GetPageNum() - 1) / 2); } else if (nSId == SID_SLIDE_MASTERPAGE && pPage->GetAutoLayout() != AUTOLAYOUT_TITLE) { - bFound = sal_True; + bFound = true; SwitchPage((pPage->GetPageNum() - 1) / 2); } @@ -1045,7 +1045,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) const SfxItemSet* pReqArgs = rReq.GetArgs(); // Remember old ruler state - sal_Bool bOldHasRuler(HasRuler()); + bool bOldHasRuler(HasRuler()); if ( pReqArgs ) { @@ -1055,7 +1055,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) else SetRuler (!HasRuler()); // Did ruler state change? Tell that to SdOptions, too. - sal_Bool bHasRuler(HasRuler()); + bool bHasRuler(HasRuler()); if(bOldHasRuler != bHasRuler) { @@ -1119,7 +1119,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_SIZE_REAL: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetZoom( 100 ); Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0), GetActiveWindow()->GetOutputSizePixel()) ); @@ -1134,7 +1134,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_ZOOM_IN: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetZoom( std::max( (long) ( GetActiveWindow()->GetZoom() / 2 ), (long) GetActiveWindow()->GetMinZoom() ) ); Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0), GetActiveWindow()->GetOutputSizePixel()) ); @@ -1154,7 +1154,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (aVisAreaSize.Height()!=0 && aVisAreaSize.Width()!=0) { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetZoomRect(aVisArea); Invalidate( SID_ZOOM_IN ); Invalidate( SID_ZOOM_OUT ); @@ -1169,7 +1169,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // --> Is offered as object zoom in program case SID_SIZE_OPTIMAL: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; if ( mpDrawView->AreObjectsMarked() ) { maMarkRect = mpDrawView->GetAllMarkedRect(); @@ -1199,7 +1199,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // --> Is offered as optimal in program case SID_SIZE_ALL: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if( pPageView ) @@ -1298,7 +1298,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_AUTOSPELL_CHECK: { - sal_Bool bOnlineSpell = !GetDoc()->GetOnlineSpell(); + bool bOnlineSpell = !GetDoc()->GetOnlineSpell(); GetDoc()->SetOnlineSpell(bOnlineSpell); ::Outliner* pOL = mpDrawView->GetTextEditOutliner(); @@ -1460,13 +1460,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_UNDO : { // moved implementation to BaseClass - ImpSidUndo(sal_True, rReq); + ImpSidUndo(true, rReq); } break; case SID_REDO : { // moved implementation to BaseClass - ImpSidRedo(sal_True, rReq); + ImpSidRedo(true, rReq); } break; @@ -1556,7 +1556,7 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText, void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos) { - sal_Bool bNewObj = sal_True; + bool bNewObj = true; const OUString sTargetURL( ::URIHelper::SmartRel2Abs( INetURLObject( GetDocSh()->GetMedium()->GetBaseURL() ), rURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, @@ -1569,7 +1569,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, // change first marked object if( (FmFormInventor == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) ) { - bNewObj = sal_False; + bNewObj = false; SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pMarkedObj ); @@ -1591,7 +1591,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, else { // add url as interaction for first selected shape - bNewObj = sal_False; + bNewObj = false; SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pMarkedObj, true); pInfo->meClickAction = presentation::ClickAction_DOCUMENT; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 421a50b6457a..ea10bdf6bb04 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -276,7 +276,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); - sal_Bool bAttr = sal_False; + bool bAttr = false; SfxAllItemSet aAllSet( *rSet.GetPool() ); while ( nWhich ) @@ -298,7 +298,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -315,7 +315,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -332,7 +332,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -349,7 +349,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -361,7 +361,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxLRSpaceItem aLRSpace = ( (const SvxLRSpaceItem&) aAttrs.Get( EE_PARA_LRSPACE ) ); aLRSpace.SetWhich(SID_ATTR_PARA_LRSPACE); rSet.Put(aLRSpace); - bAttr = sal_True; + bAttr = true; Invalidate(SID_ATTR_PARA_LRSPACE); } break; @@ -371,7 +371,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); SvxLineSpacingItem aLineLR = ( (const SvxLineSpacingItem&) aAttrs.Get( EE_PARA_SBL ) ); rSet.Put(aLineLR); - bAttr = sal_True; + bAttr = true; Invalidate(SID_ATTR_PARA_LINESPACE); } break; @@ -382,7 +382,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxULSpaceItem aULSP = ( (const SvxULSpaceItem&) aAttrs.Get( EE_PARA_ULSPACE ) ); aULSP.SetWhich(SID_ATTR_PARA_ULSPACE); rSet.Put(aULSP); - bAttr = sal_True; + bAttr = true; Invalidate(SID_ATTR_PARA_ULSPACE); } break; @@ -414,7 +414,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_SET_SUB_SCRIPT: case SID_SET_SUPER_SCRIPT: { - bAttr = sal_True; + bAttr = true; } break; @@ -424,7 +424,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) { - sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); + bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_HYPHENATION, bValue ) ); } } @@ -590,7 +590,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } if ( nCount == 1 ) { - sal_Bool bBullets = sal_False; + bool bBullets = false; const SvxNumberFormat* pNumFmt = pNumRule->Get(nCurLevel); if ( pNumFmt ) { @@ -598,11 +598,11 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { case SVX_NUM_CHAR_SPECIAL: case SVX_NUM_BITMAP: - bBullets = sal_True; + bBullets = true; break; default: - bBullets = sal_False; + bBullets = false; } rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX,(sal_uInt16)0xFFFF)); @@ -635,7 +635,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case FN_NUM_BULLET_ON: case FN_NUM_NUMBERING_ON: { - sal_Bool bEnable = sal_False; + bool bEnable = false; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const sal_uInt32 nMarkCount = rMarkList.GetMarkCount(); for (sal_uInt32 nIndex = 0; nIndex < nMarkCount; nIndex++) @@ -645,7 +645,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { if (pTextObj->GetObjIdentifier() != OBJ_OLE2) { - bEnable = sal_True; + bEnable = true; break; } } @@ -766,9 +766,9 @@ OUString DrawViewShell::GetSelectionText(bool bCompleteWords) } -sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const +bool DrawViewShell::HasSelection(bool bText) const { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (bText) { @@ -776,12 +776,12 @@ sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const if (pOlView && !pOlView->GetSelected().isEmpty()) { - bReturn = sal_True; + bReturn = true; } } else if (mpDrawView->GetMarkedObjectList().GetMarkCount() != 0) { - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index bb83db6737c8..fd6398a1ad3f 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -76,7 +76,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) void DrawViewShell::GetIMapState( SfxItemSet& rSet ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { @@ -92,7 +92,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) && pImageMapDialog!=NULL && ( pImageMapDialog->GetEditingObject() == (void*) pObj ) ) { - bDisable = sal_False; + bDisable = false; } } } @@ -107,7 +107,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) if(HasCurrentFunction(SID_PRESENTATION)) return; - sal_Bool bDefault = sal_False; + bool bDefault = false; sal_uInt16 nSlot = rReq.GetSlot(); SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType()); @@ -196,7 +196,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) break; default: - bDefault = sal_True; + bDefault = true; break; } diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 8164a2897c55..c8e1e631ad35 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -43,9 +43,9 @@ namespace sd { -sal_Bool DrawViewShell::GotoBookmark(const OUString& rBookmark) +bool DrawViewShell::GotoBookmark(const OUString& rBookmark) { - sal_Bool bRet = sal_False; + bool bRet = false; ::sd::DrawDocShell* pDocSh = GetDocSh(); if( pDocSh ) { diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index a1bc9686f033..9b0717619ea3 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -198,7 +198,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_CONNECTION_DLG ); else { - sal_Bool bDisable = sal_True; + bool bDisable = true; SfxItemSet aAttrSet( GetDoc()->GetPool() ); GetView()->GetAttributes( aAttrSet ); @@ -211,7 +211,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) long nVal3 = ( ( const SdrEdgeLine3DeltaItem& ) aAttrSet.Get( SDRATTR_EDGELINE3DELTA ) ).GetValue(); { if( nVal1 != 0 || nVal2 != 0 || nVal3 != 0 ) - bDisable = sal_False; + bDisable = false; } } if( bDisable ) @@ -309,16 +309,16 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_MODIFY_FIELD ); { - sal_Bool bText = sal_False; - sal_Bool bLine = sal_False; - sal_Bool bGroup = sal_False; - sal_Bool bGraf = sal_False; - sal_Bool bDrawObj = sal_False; - sal_Bool b3dObj = sal_False; + bool bText = false; + bool bLine = false; + bool bGroup = false; + bool bGraf = false; + bool bDrawObj = false; + bool b3dObj = false; bool bTable = false; - sal_Bool bMeasureObj = sal_False; - sal_Bool bEdgeObj = sal_False; // Connector - sal_Bool bE3dCompoundObject = sal_False; + bool bMeasureObj = false; + bool bEdgeObj = false; // Connector + bool bE3dCompoundObject = false; for( sal_uLong i = 0; i < nMarkCount && !bText && i < 50; @@ -332,13 +332,13 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) { switch (nId) { - case OBJ_TEXT: bText = sal_True; break; + case OBJ_TEXT: bText = true; break; - case OBJ_LINE: bLine = sal_True; break; + case OBJ_LINE: bLine = true; break; - case OBJ_EDGE: bEdgeObj = sal_True; break; + case OBJ_EDGE: bEdgeObj = true; break; - case OBJ_MEASURE: bMeasureObj = sal_True; break; + case OBJ_MEASURE: bMeasureObj = true; break; case OBJ_RECT: case OBJ_CIRC: @@ -348,11 +348,11 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) case OBJ_PATHLINE: case OBJ_SECT: case OBJ_CARC: - case OBJ_CCUT: bDrawObj = sal_True; break; + case OBJ_CCUT: bDrawObj = true; break; - case OBJ_GRUP: bGroup = sal_True; break; + case OBJ_GRUP: bGroup = true; break; - case OBJ_GRAF: bGraf = sal_True; break; + case OBJ_GRAF: bGraf = true; break; case OBJ_TABLE: bTable = true; break; } @@ -360,9 +360,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) else if (nInv == E3dInventor) { if(pObj->ISA(E3dScene)) - b3dObj = sal_True; + b3dObj = true; else if(pObj->ISA(E3dCompoundObject)) - bE3dCompoundObject = sal_True; + bE3dCompoundObject = true; } } if( bLine && !bText && !bDrawObj &&!b3dObj) diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 855d91d5d1d7..3121d6478d5a 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -207,8 +207,8 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetGridCoarse( Size( 1000, 1000 ) ); SetSnapGridWidth(Fraction(1000, 1), Fraction(1000, 1)); SetActiveLayer( SD_RESSTR(STR_LAYER_LAYOUT) ); - mbNoColors = sal_True; - mbNoAttribs = sal_False; + mbNoColors = true; + mbNoAttribs = false; maVisArea = Rectangle( Point(), Size(0, 0) ); mePageKind = PK_STANDARD; mePageKindOnLoad = PK_STANDARD; @@ -218,10 +218,10 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * meNotesEditMode = EM_PAGE; meHandoutEditMode = EM_MASTERPAGE; SetViewShEditModeOnLoad(EM_PAGE); - mbLayerMode = sal_False; + mbLayerMode = false; SetEliminatePolyPoints(false); - mbDoubleClickTextEdit = sal_False; - mbClickChangeRotation = sal_False; + mbDoubleClickTextEdit = false; + mbClickChangeRotation = false; mnSlidesPerRow = 4; { @@ -234,15 +234,15 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetViewShellTypeOnLoad (ViewShell::ST_IMPRESS); // get default for design mode - sal_Bool bInitDesignMode = pDrawDoc->GetOpenInDesignMode(); + bool bInitDesignMode = pDrawDoc->GetOpenInDesignMode(); if( pDrawDoc->OpenInDesignModeIsDefaulted() ) { - bInitDesignMode = sal_True; + bInitDesignMode = true; } SfxObjectShell* pObjShell = pDrawDoc->GetObjectShell(); if( pObjShell && pObjShell->IsReadOnly() ) - bInitDesignMode = sal_False; + bInitDesignMode = false; SetDesignMode( bInitDesignMode ); Update( SD_MOD()->GetSdOptions(pDrawDoc->GetDocumentType()) ); @@ -427,19 +427,19 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: { std::vector< std::pair< OUString, Any > > aUserData; - aUserData.addValue( sUNO_View_GridIsVisible, makeAny( (sal_Bool)IsGridVisible() ) ); - aUserData.addValue( sUNO_View_GridIsFront, makeAny( (sal_Bool)IsGridFront() ) ); - aUserData.addValue( sUNO_View_IsSnapToGrid, makeAny( (sal_Bool)IsGridSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToPageMargins, makeAny( (sal_Bool)IsBordSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToSnapLines, makeAny( (sal_Bool)IsHlplSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) ); + aUserData.addValue( sUNO_View_GridIsVisible, makeAny( IsGridVisible() ) ); + aUserData.addValue( sUNO_View_GridIsFront, makeAny( IsGridFront() ) ); + aUserData.addValue( sUNO_View_IsSnapToGrid, makeAny( IsGridSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToPageMargins, makeAny( IsBordSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToSnapLines, makeAny( IsHlplSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( IsOFrmSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( IsOPntSnap() ) ); - aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( (sal_Bool)IsPlusHandlesAlwaysVisible() ) ); - aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) ); + aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( IsPlusHandlesAlwaysVisible() ) ); + aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( IsFrameDragSingles() ) ); aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( (sal_Int32)GetEliminatePolyPointLimitAngle() ) ); - aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( (sal_Bool)IsEliminatePolyPoints() ) ); + aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( IsEliminatePolyPoints() ) ); Any aAny; GetVisibleLayers().QueryValue( aAny ); @@ -451,8 +451,8 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: GetLockedLayers().QueryValue( aAny ); aUserData.addValue( sUNO_View_LockedLayers, aAny ); - aUserData.addValue( sUNO_View_NoAttribs, makeAny( (sal_Bool)IsNoAttribs() ) ); - aUserData.addValue( sUNO_View_NoColors, makeAny( (sal_Bool)IsNoColors() ) ); + aUserData.addValue( sUNO_View_NoAttribs, makeAny( IsNoAttribs() ) ); + aUserData.addValue( sUNO_View_NoColors, makeAny( IsNoColors() ) ); if( GetStandardHelpLines().GetCount() ) aUserData.addValue( sUNO_View_SnapLinesDrawing, makeAny( createHelpLinesString( GetStandardHelpLines() ) ) ); @@ -463,13 +463,13 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: if( GetHandoutHelpLines().GetCount() ) aUserData.addValue( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) ); - aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( (sal_Bool)HasRuler() ) ); + aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( HasRuler() ) ); aUserData.addValue( sUNO_View_PageKind, makeAny( (sal_Int16)GetPageKind() ) ); aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) ); - aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) ); + aUserData.addValue( sUNO_View_IsLayerMode, makeAny( IsLayerMode() ) ); - aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( (sal_Bool)IsDoubleClickTextEdit() ) ); - aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) ); + aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( IsDoubleClickTextEdit() ) ); + aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( IsClickChangeRotation() ) ); aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) ); aUserData.addValue( sUNO_View_EditModeStandard, makeAny( (sal_Int32)GetViewShEditMode( PK_STANDARD ) ) ); @@ -493,7 +493,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_GridSnapWidthXDenominator, makeAny( (sal_Int32)GetSnapGridWidthX().GetDenominator() ) ); aUserData.addValue( sUNO_View_GridSnapWidthYNumerator, makeAny( (sal_Int32)GetSnapGridWidthY().GetNumerator() ) ); aUserData.addValue( sUNO_View_GridSnapWidthYDenominator, makeAny( (sal_Int32)GetSnapGridWidthY().GetDenominator() ) ); - aUserData.addValue( sUNO_View_IsAngleSnapEnabled, makeAny( (sal_Bool)IsAngleSnapEnabled() ) ); + aUserData.addValue( sUNO_View_IsAngleSnapEnabled, makeAny( IsAngleSnapEnabled() ) ); aUserData.addValue( sUNO_View_SnapAngle, makeAny( (sal_Int32)GetSnapAngle() ) ); const sal_Int32 nOldLength = rValues.getLength(); @@ -580,7 +580,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : { const bool bImpress = dynamic_cast< SdDrawDocument* >(GetModel())->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; - sal_Bool bBool = sal_False; + bool bBool = false; sal_Int32 nInt32 = 0; sal_Int16 nInt16 = 0; OUString aString; diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 305b71cabd7e..9b88288176ad 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -573,10 +573,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) //pOLV->DeleteSelected(); <-- unfortunately missing! // select field, so it gets deleted on Insert ESelection aSel = pOutlinerView->GetSelection(); - sal_Bool bSel = sal_True; + bool bSel = true; if( aSel.nStartPos == aSel.nEndPos ) { - bSel = sal_False; + bSel = false; aSel.nEndPos++; } pOutlinerView->SetSelection( aSel ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index f8d61b0f7757..515e013dbe8a 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -132,7 +132,7 @@ TYPEINIT1( OutlineViewShell, ViewShell ); */ void OutlineViewShell::Construct(DrawDocShell* ) { - sal_Bool bModified = GetDoc()->IsChanged(); + bool bModified = GetDoc()->IsChanged(); meShellType = ST_OUTLINE; Size aSize(29700, 21000); @@ -459,7 +459,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs()) GetDocSh()->SetStyleFamily(((SfxUInt16Item&)rReq.GetArgs()->Get( SID_STYLE_FAMILY )).GetValue()); - sal_Bool bPreviewState = sal_False; + bool bPreviewState = false; sal_uLong nSlot = rReq.GetSlot(); boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard; @@ -494,7 +494,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCut(); } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -509,7 +509,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCopy(); } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -526,7 +526,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoPaste(); } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -546,7 +546,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { pOlView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, sal_False, FORMAT_STRING); + nAction, false, FORMAT_STRING); } } @@ -573,7 +573,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -672,7 +672,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -680,13 +680,13 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_UNDO : { OutlineViewPageChangesGuard aGuard2(pOlView); - ImpSidUndo(sal_False, rReq); + ImpSidUndo(false, rReq); } break; case SID_REDO : { OutlineViewPageChangesGuard aGuard2(pOlView); - ImpSidRedo(sal_False, rReq); + ImpSidRedo(false, rReq); } break; @@ -805,13 +805,13 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SELECTALL ) ) { sal_Int32 nParaCount = pOutl->GetParagraphCount(); - sal_Bool bDisable = nParaCount == 0; + bool bDisable = nParaCount == 0; if (!bDisable && nParaCount == 1) { OUString aTest = pOutl->GetText(pOutl->GetParagraph(0)); if (aTest.isEmpty()) { - bDisable = sal_True; + bDisable = true; } } if (bDisable) @@ -830,18 +830,18 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { // Enable color view? sal_uLong nCntrl = pOutl->GetControlWord(); - sal_Bool bNoColor = sal_False; + bool bNoColor = false; if (nCntrl & EE_CNTRL_NOCOLORS) - bNoColor = sal_True; + bNoColor = true; rSet.Put( SfxBoolItem( SID_COLORVIEW, bNoColor ) ); } // Buttons of toolbar // first the selection dependent ones: COLLAPSE, EXPAND - sal_Bool bDisableCollapse = sal_True; - sal_Bool bDisableExpand = sal_True; - sal_Bool bUnique = sal_True; + bool bDisableCollapse = true; + bool bDisableExpand = true; + bool bUnique = true; OutlinerView* pOutlinerView = pOlView->GetViewByWindow(GetActiveWindow()); std::vector<Paragraph*> aSelList; @@ -863,14 +863,14 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) nDepth = pOutl->GetDepth( pOutl->GetAbsPos( pPara ) ); if( nDepth != nTmpDepth || bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE )) - bUnique = sal_False; + bUnique = false; if (pOutl->HasChildren(pPara)) { if (!pOutl->IsExpanded(pPara)) - bDisableExpand = sal_False; + bDisableExpand = false; else - bDisableCollapse = sal_False; + bDisableCollapse = false; } ++iter; @@ -889,7 +889,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) OUString aTest = ((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue(); if (aTest.isEmpty()) { - bUnique = sal_False; + bUnique = false; rSet.DisableItem(SID_PRESENTATION_TEMPLATES); } @@ -897,14 +897,14 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_PRESENTATIONOBJECT ); // now the selection independent ones: COLLAPSE_ALL, EXPAND_ALL - sal_Bool bDisableCollapseAll = sal_True; - sal_Bool bDisableExpandAll = sal_True; + bool bDisableCollapseAll = true; + bool bDisableExpandAll = true; // does the selection contain something collapsable/expandable? if (!bDisableCollapse) - bDisableCollapseAll = sal_False; + bDisableCollapseAll = false; if (!bDisableExpand) - bDisableExpandAll = sal_False; + bDisableExpandAll = false; // otherwise look through all paragraphs if (bDisableCollapseAll || bDisableExpandAll) @@ -914,10 +914,10 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) while (pPara && (bDisableCollapseAll || bDisableExpandAll)) { if (!pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara)) - bDisableExpandAll = sal_False; + bDisableExpandAll = false; if (pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara)) - bDisableCollapseAll = sal_False; + bDisableCollapseAll = false; pPara = pOutl->GetParagraph( ++nParaPos ); } @@ -1000,7 +1000,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE)) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); pOlView->SetSelectedPages(); @@ -1047,7 +1047,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_SUMMARY_PAGE)) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); pOlView->SetSelectedPages(); @@ -1062,7 +1062,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pObj && !pObj->IsEmptyPresObj()) { - bDisable = sal_False; + bDisable = false; } } @@ -1094,7 +1094,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // is starting the presentation possible? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); for( sal_uInt16 i = 0; i < nCount && bDisable; i++ ) @@ -1102,7 +1102,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD); if( !pPage->IsExcluded() ) - bDisable = sal_False; + bDisable = false; } if( bDisable || GetDocSh()->IsPreview()) { @@ -1170,7 +1170,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) * PrepareClose, gets called when the Shell shall be destroyed. * Forwards the invocation to the View */ -bool OutlineViewShell::PrepareClose( sal_Bool bUI ) +bool OutlineViewShell::PrepareClose( bool bUI ) { if( !ViewShell::PrepareClose(bUI) ) return false; @@ -1301,9 +1301,9 @@ void OutlineViewShell::WriteFrameViewData() ::Outliner* pOutl = pOlView->GetOutliner(); sal_uLong nCntrl = pOutl->GetControlWord(); - sal_Bool bNoColor = sal_False; + bool bNoColor = false; if (nCntrl & EE_CNTRL_NOCOLORS) - bNoColor = sal_True; + bNoColor = true; mpFrameView->SetNoColors(bNoColor); mpFrameView->SetNoAttribs( pOutl->IsFlatMode() ); SdPage* pActualPage = pOlView->GetActualPage(); @@ -1457,9 +1457,9 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) -sal_Bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) +bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { - sal_Bool bReturn = sal_False; + bool bReturn = false; OutlineViewPageChangesGuard aGuard(pOlView); if (pWin == NULL && HasCurrentFunction()) @@ -1528,9 +1528,9 @@ OUString OutlineViewShell::GetSelectionText(bool bCompleteWords) /** * Is something selected? */ -sal_Bool OutlineViewShell::HasSelection(sal_Bool bText) const +bool OutlineViewShell::HasSelection(bool bText) const { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (bText) { @@ -1538,7 +1538,7 @@ sal_Bool OutlineViewShell::HasSelection(sal_Bool bText) const if (pOutlinerView && !pOutlinerView->GetSelected().isEmpty()) { - bReturn = sal_True; + bReturn = true; } } @@ -1685,7 +1685,7 @@ SdPage* OutlineViewShell::GetActualPage() return pOlView->GetActualPage(); } -void OutlineViewShell::UpdatePreview( SdPage* pPage, sal_Bool ) +void OutlineViewShell::UpdatePreview( SdPage* pPage, bool ) { const bool bNewPage = pPage != pLastPage; pLastPage = pPage; @@ -1791,7 +1791,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) OutlinerParaObject* pOPO = NULL; SdrTextObj* pTO = NULL; - sal_Bool bNewObject = sal_False; + bool bNewObject = false; sal_uInt16 eOutlinerMode = OUTLINERMODE_TITLEOBJECT; pTO = (SdrTextObj*)pPage->GetPresObj( PRESOBJ_TEXT ); @@ -1826,7 +1826,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pTO ) { pTO = pOlView->CreateOutlineTextObject( pPage ); - bNewObject = sal_True; + bNewObject = true; } // page object, outline text in Outliner: @@ -1947,14 +1947,14 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal return( bRet ); } -void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); ViewShell::WriteUserDataSequence( rSequence, bBrowse ); } -void OutlineViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void OutlineViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -2032,8 +2032,8 @@ void OutlineViewShell::SetCurrentPage (SdPage* pPage) for (sal_uInt16 i=0; i<GetDoc()->GetSdPageCount(PK_STANDARD); i++) GetDoc()->SetSelected( GetDoc()->GetSdPage(i, PK_STANDARD), - sal_False); - GetDoc()->SetSelected (pPage, sal_True); + false); + GetDoc()->SetSelected (pPage, true); DrawController& rController(GetViewShellBase().GetDrawController()); rController.FireSelectionChangeListener(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 692a70e76554..4436bdd07003 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -90,20 +90,20 @@ TYPEINIT1( OutlineView, ::sd::View ); OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewShell) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell) , mrOutlineViewShell(rOutlineViewShell) -, mrOutliner(*mrDoc.GetOutliner(sal_True)) +, mrOutliner(*mrDoc.GetOutliner(true)) , mnPagesToProcess(0) , mnPagesProcessed(0) -, mbFirstPaint(sal_True) +, mbFirstPaint(true) , mpProgress(NULL) , maDocColor( COL_WHITE ) , maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE ) { - sal_Bool bInitOutliner = sal_False; + bool bInitOutliner = false; if (mrOutliner.GetViewCount() == 0) { // initialize Outliner: set Reference Device - bInitOutliner = sal_True; + bInitOutliner = true; mrOutliner.Init( OUTLINERMODE_OUTLINEVIEW ); mrOutliner.SetRefDevice( SD_MOD()->GetRefDevice( rDocSh ) ); //viewsize without the width of the image and number in front @@ -225,7 +225,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) pOlView->ShowCursor(mbFirstPaint); - mbFirstPaint = sal_False; + mbFirstPaint = false; } } @@ -242,8 +242,8 @@ void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*) void OutlineView::AddWindowToPaintView(OutputDevice* pWin) { - sal_Bool bAdded = sal_False; - sal_Bool bValidArea = sal_False; + bool bAdded = false; + bool bValidArea = false; Rectangle aOutputArea; const Color aWhiteColor( COL_WHITE ); sal_uInt16 nView = 0; @@ -255,7 +255,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) mpOutlinerView[nView] = new OutlinerView(&mrOutliner, dynamic_cast< ::sd::Window* >(pWin)); mpOutlinerView[nView]->SetBackgroundColor( aWhiteColor ); mrOutliner.InsertView(mpOutlinerView[nView], EE_APPEND); - bAdded = sal_True; + bAdded = true; if (bValidArea) { @@ -265,7 +265,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) else if (!bValidArea) { aOutputArea = mpOutlinerView[nView]->GetOutputArea(); - bValidArea = sal_True; + bValidArea = true; } nView++; @@ -279,7 +279,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { - sal_Bool bRemoved = sal_False; + bool bRemoved = false; sal_uInt16 nView = 0; ::Window* pWindow; @@ -294,7 +294,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) mrOutliner.RemoveView( mpOutlinerView[nView] ); delete mpOutlinerView[nView]; mpOutlinerView[nView] = NULL; - bRemoved = sal_True; + bRemoved = true; } } @@ -467,11 +467,11 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) if (eAutoLayout == AUTOLAYOUT_TITLE || eAutoLayout == AUTOLAYOUT_ONLY_TITLE) { - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); + pPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); } else { - pPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); + pPage->SetAutoLayout(pExample->GetAutoLayout(), true); } /********************************************************************** @@ -500,7 +500,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) pExample->GetLwrBorder() ); // create presentation objects - pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); + pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), true); mrOutliner.UpdateFields(); @@ -928,7 +928,7 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) while (nPageCount) { SdPage* pPage = mrDoc.GetSdPage(nPosNewOrder, PK_STANDARD); - pPage->SetSelected(sal_False); + pPage->SetSelected(false); nPosNewOrder++; nPageCount--; } @@ -1048,7 +1048,7 @@ sal_uLong OutlineView::GetPaperWidth() } /** updates draw model with all changes from outliner model */ -sal_Bool OutlineView::PrepareClose(sal_Bool) +bool OutlineView::PrepareClose(bool) { ::sd::UndoManager* pDocUndoMgr = dynamic_cast<sd::UndoManager*>(mpDocSh->GetUndoManager()); if (pDocUndoMgr != NULL) @@ -1059,23 +1059,23 @@ sal_Bool OutlineView::PrepareClose(sal_Bool) BegUndo(SD_RESSTR(STR_UNDO_CHANGE_TITLE_AND_LAYOUT)); UpdateDocument(); EndUndo(); - mrDoc.SetSelected(GetActualPage(), sal_True); - return sal_True; + mrDoc.SetSelected(GetActualPage(), true); + return true; } /** * Set attributes of the selected text */ -sal_Bool OutlineView::SetAttributes(const SfxItemSet& rSet, sal_Bool ) +bool OutlineView::SetAttributes(const SfxItemSet& rSet, bool ) { - sal_Bool bOk = sal_False; + bool bOk = false; OutlinerView* pOlView = GetViewByWindow(mrOutlineViewShell.GetActiveWindow()); if (pOlView) { pOlView->SetAttribs(rSet); - bOk = sal_True; + bOk = true; } mrOutlineViewShell.Invalidate (SID_PREVIEW_STATE); @@ -1086,14 +1086,14 @@ sal_Bool OutlineView::SetAttributes(const SfxItemSet& rSet, sal_Bool ) /** * Get attributes of the selected text */ -sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const +bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, bool ) const { OutlinerView* pOlView = GetViewByWindow( mrOutlineViewShell.GetActiveWindow()); DBG_ASSERT(pOlView, "keine OutlinerView gefunden"); rTargetSet.Put( pOlView->GetAttribs(), false ); - return sal_True; + return true; } /** creates outliner model from draw model */ @@ -1120,7 +1120,7 @@ void OutlineView::FillOutliner() OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject(); if (pOPO) { - sal_Bool bVertical = pOPO->IsVertical(); + bool bVertical = pOPO->IsVertical(); pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); @@ -1163,7 +1163,7 @@ void OutlineView::FillOutliner() if (pOPO) { sal_Int32 nParaCount1 = mrOutliner.GetParagraphCount(); - sal_Bool bVertical = pOPO->IsVertical(); + bool bVertical = pOPO->IsVertical(); pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); @@ -1550,7 +1550,7 @@ void OutlineView::UpdateDocument() for (nPage = 0; nPage < nPageCount; nPage++) { SdPage* pPage = mrDoc.GetSdPage( (sal_uInt16)nPage, PK_STANDARD); - mrDoc.SetSelected(pPage, sal_False); + mrDoc.SetSelected(pPage, false); mrOutlineViewShell.UpdateTitleObject( pPage, pPara ); mrOutlineViewShell.UpdateOutlineObject( pPage, pPara ); @@ -1563,7 +1563,7 @@ void OutlineView::UpdateDocument() while( pPara ) { SdPage* pPage = InsertSlideForParagraph( pPara ); - mrDoc.SetSelected(pPage, sal_False); + mrDoc.SetSelected(pPage, false); mrOutlineViewShell.UpdateTitleObject( pPage, pPara ); mrOutlineViewShell.UpdateOutlineObject( pPage, pPara ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index b81af442b771..b9e01ef458c9 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -110,7 +110,7 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView ) } -SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, sal_Bool) +SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, bool) { return NULL; } diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 3a7ebd3b9ea2..e39bf32d3847 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -84,12 +84,12 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal if ( nWinStyle & WB_HSCROLL ) { - bHorz = sal_True; + bHorz = true; SetHelpId( HID_SD_RULER_HORIZONTAL ); } else { - bHorz = sal_False; + bHorz = false; SetHelpId( HID_SD_RULER_VERTICAL ); } } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 4a7f344aa813..53e48a550ee3 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -160,7 +160,7 @@ View::~View() maSmartTags.Dispose(); // release content of selection clipboard, if we own the content - UpdateSelectionClipboard( sal_True ); + UpdateSelectionClipboard( true ); maDropErrorTimer.Stop(); maDropInsertFileTimer.Stop(); @@ -527,14 +527,14 @@ void View::MarkListHasChanged() } -sal_Bool View::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) +bool View::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { - sal_Bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); + bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); return (bOk); } -sal_Bool View::GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr ) const +bool View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const { return( FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ) ); } @@ -543,7 +543,7 @@ sal_Bool View::GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr ) c /** * Is a presentation object selected? */ -sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_Bool bCheckPresObjListOnly, sal_Bool bCheckLayoutOnly) const +bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresObjListOnly, bool bCheckLayoutOnly) const { SdrMarkList* pMarkList; @@ -565,8 +565,8 @@ sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_B SdPage* pPage; SdrObject* pObj; - sal_Bool bSelected = sal_False; - sal_Bool bMasterPage = sal_False; + bool bSelected = false; + bool bMasterPage = false; long nMark; long nMarkMax = long(pMarkList->GetMarkCount()) - 1; @@ -590,11 +590,11 @@ sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_B PresObjKind eKind = pPage->GetPresObjKind(pObj); if((eKind != PRESOBJ_FOOTER) && (eKind != PRESOBJ_HEADER) && (eKind != PRESOBJ_DATETIME) && (eKind != PRESOBJ_SLIDENUMBER) ) - bSelected = sal_True; + bSelected = true; } else { - bSelected = sal_True; + bSelected = true; } } } @@ -633,7 +633,7 @@ void View::ModelHasChanged() } -sal_Bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { // forward to SdrView return FmFormView::SetStyleSheet(pStyleSheet, bDontRemoveHardAttr); @@ -645,7 +645,7 @@ sal_Bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHar */ static void SetSpellOptions( const SdDrawDocument& rDoc, sal_uLong& rCntrl ) { - sal_Bool bOnlineSpell = rDoc.GetOnlineSpell(); + bool bOnlineSpell = rDoc.GetOnlineSpell(); if( bOnlineSpell ) rCntrl |= EE_CNTRL_ONLINESPELLING; @@ -695,7 +695,7 @@ bool View::SdrBeginTextEdit( pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); } - sal_Bool bReturn = FmFormView::SdrBeginTextEdit( + bool bReturn = FmFormView::SdrBeginTextEdit( pObj, pPV, pWin, bIsNewObj, pOutl, pGivenOutlinerView, bDontDeleteOutliner, bOnlyOneView, bGrabFocus); @@ -739,7 +739,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally ) { SdrObjectWeakRef xObj( GetTextEditObject() ); - sal_Bool bDefaultTextRestored = RestoreDefaultText( dynamic_cast< SdrTextObj* >( GetTextEditObject() ) ); + bool bDefaultTextRestored = RestoreDefaultText( dynamic_cast< SdrTextObj* >( GetTextEditObject() ) ); SdrEndTextEditKind eKind = FmFormView::SdrEndTextEdit(bDontDeleteReally); @@ -823,7 +823,7 @@ void View::SetMarkedOriginalSize() { SdrUndoGroup* pUndoGroup = new SdrUndoGroup(mrDoc); sal_uLong nCount = GetMarkedObjectCount(); - sal_Bool bOK = sal_False; + bool bOK = false; for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -845,7 +845,7 @@ void View::SetMarkedOriginalSize() { MapMode aMap100( MAP_100TH_MM ); aOleSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMap100 ); - bOK = sal_True; + bOK = true; } else { @@ -854,7 +854,7 @@ void View::SetMarkedOriginalSize() { awt::Size aSz = xObj->getVisualAreaSize( nAspect ); aOleSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aUnit, MAP_100TH_MM ); - bOK = sal_True; + bOK = true; } catch( embed::NoVisualAreaSizeException& ) {} @@ -889,7 +889,7 @@ void View::SetMarkedOriginalSize() aRect.SetSize( aSize ); pObj->SetLogicRect( aRect ); - bOK = sal_True; + bOK = true; } } } @@ -943,10 +943,10 @@ void View::DoConnect(SdrOle2Obj* pObj) } } -sal_Bool View::IsMorphingAllowed() const +bool View::IsMorphingAllowed() const { const SdrMarkList& rMarkList = GetMarkedObjectList(); - sal_Bool bRet = sal_False; + bool bRet = false; if ( rMarkList.GetMarkCount() == 2 ) { @@ -982,17 +982,17 @@ sal_Bool View::IsMorphingAllowed() const if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) ) - bRet = sal_True; + bRet = true; } } return bRet; } -sal_Bool View::IsVectorizeAllowed() const +bool View::IsVectorizeAllowed() const { const SdrMarkList& rMarkList = GetMarkedObjectList(); - sal_Bool bRet = sal_False; + bool bRet = false; if( rMarkList.GetMarkCount() == 1 ) { @@ -1002,7 +1002,7 @@ sal_Bool View::IsVectorizeAllowed() const { if(GRAPHIC_BITMAP == pObj->GetGraphicType() && !pObj->isEmbeddedSvg()) { - bRet = sal_True; + bRet = true; } } } @@ -1161,7 +1161,7 @@ bool View::MarkPoint(SdrHdl& rHdl, bool bUnmark ) return FmFormView::MarkPoint( rHdl, bUnmark ); } -sal_Bool View::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) +bool View::MarkPoints(const Rectangle* pRect, bool bUnmark) { if( maSmartTags.MarkPoints( pRect, bUnmark ) ) return true; @@ -1246,7 +1246,7 @@ bool View::ShouldToggleOn( if (!pSdrModel) return false; - sal_Bool bToggleOn = sal_False; + bool bToggleOn = false; SdrOutliner* pOutliner = SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, pSdrModel); sal_uInt32 nMarkCount = GetMarkedObjectCount(); for (sal_uInt32 nIndex = 0; nIndex < nMarkCount && !bToggleOn; nIndex++) diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 8300a2415fec..8b7eae3cd50e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -101,7 +101,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically - SdTransferable* pTransferable = new SdTransferable( &mrDoc, NULL, sal_False ); + SdTransferable* pTransferable = new SdTransferable( &mrDoc, NULL, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferClip = pTransferable; @@ -166,7 +166,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) { - SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, sal_False ); + SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferDrag = pTransferable; @@ -217,7 +217,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) { - SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, sal_True ); + SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); TransferableObjectDescriptor aObjDesc; const Rectangle aMarkRect( GetAllMarkedRect() ); @@ -242,7 +242,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent -void View::UpdateSelectionClipboard( sal_Bool bForceDeselect ) +void View::UpdateSelectionClipboard( bool bForceDeselect ) { if( mpViewSh && mpViewSh->GetActiveWindow() ) { @@ -315,7 +315,7 @@ void View::DoPaste (::Window* pWindow) // remove all hard linebreaks from the title if( pOutliner && pOutliner->GetParagraphCount() > 1 ) { - sal_Bool bOldUpdateMode = pOutliner->GetUpdateMode(); + bool bOldUpdateMode = pOutliner->GetUpdateMode(); pOutliner->SetUpdateMode( false ); @@ -353,7 +353,7 @@ void View::DoPaste (::Window* pWindow) if (pDrViewSh != NULL) { - if( !InsertData( aDataHelper, aPos, nDnDAction, sal_False ) ) + if( !InsertData( aDataHelper, aPos, nDnDAction, false ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -459,7 +459,7 @@ void View::DragFinished( sal_Int8 nDropAction ) } if( pDragTransferable ) - pDragTransferable->SetInternalMove( sal_False ); + pDragTransferable->SetInternalMove( false ); if( bUndo ) EndUndo(); @@ -487,7 +487,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( mbIsDropAllowed && !pPV->IsLayerLocked( aLayerName ) && pPV->IsLayerVisible( aLayerName ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - sal_Bool bIsInsideOutlinerView = sal_False; + bool bIsInsideOutlinerView = false; if( pOLV ) { @@ -502,7 +502,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( aRect.IsInside( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) ) ) { - bIsInsideOutlinerView = sal_True; + bIsInsideOutlinerView = true; } } @@ -535,12 +535,12 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge } else { - const sal_Bool bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); - const sal_Bool bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); - const sal_Bool bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); - const sal_Bool bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); - sal_Bool bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); - sal_Bool bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); + const bool bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); + const bool bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); + const bool bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); + const bool bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); + bool bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); + bool bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); // check handle insert if( !nRet && ( (bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() )) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) ) @@ -573,8 +573,8 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge SdrPageView* pPageView = NULL; ::sd::Window* pWindow = mpViewSh->GetActiveWindow(); Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); - const sal_Bool bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); - sal_Bool bIsPresTarget = sal_False; + const bool bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); + bool bIsPresTarget = false; if( bHasPickObj && pPickObj && ( pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall() ) ) { @@ -601,18 +601,18 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge nRet = nDropAction; } else - bXFillExchange = sal_False; + bXFillExchange = false; } // check normal insert if( !nRet ) { - const sal_Bool bSBAFormat = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ); - const sal_Bool bEditEngine = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_EDITENGINE ); - const sal_Bool bString = rTargetHelper.IsDropFormatSupported( FORMAT_STRING ); - const sal_Bool bRTF = rTargetHelper.IsDropFormatSupported( FORMAT_RTF ); - const sal_Bool bFile = rTargetHelper.IsDropFormatSupported( FORMAT_FILE ); - const sal_Bool bFileList = rTargetHelper.IsDropFormatSupported( FORMAT_FILE_LIST ); + const bool bSBAFormat = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ); + const bool bEditEngine = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_EDITENGINE ); + const bool bString = rTargetHelper.IsDropFormatSupported( FORMAT_STRING ); + const bool bRTF = rTargetHelper.IsDropFormatSupported( FORMAT_RTF ); + const bool bFile = rTargetHelper.IsDropFormatSupported( FORMAT_FILE ); + const bool bFileList = rTargetHelper.IsDropFormatSupported( FORMAT_FILE_LIST ); if( mpDropMarker ) { @@ -621,7 +621,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge } if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE ) && mpViewSh && SlideShow::IsRunning(mpViewSh->GetViewShellBase()) ) - bBookmark = sal_False; + bBookmark = false; if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngine || bString || bRTF ) nRet = nDropAction; @@ -669,7 +669,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pPV->IsLayerLocked( aActiveLayer ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - sal_Bool bIsInsideOutlinerView = sal_False; + bool bIsInsideOutlinerView = false; if( pOLV ) { @@ -686,7 +686,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( aRect.IsInside( aPos ) ) { - bIsInsideOutlinerView = sal_True; + bIsInsideOutlinerView = true; } } @@ -728,7 +728,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar } // standard insert? - if( !nRet && InsertData( aDataHelper, aPos, nDropAction, sal_True, 0, nPage, nLayer ) ) + if( !nRet && InsertData( aDataHelper, aPos, nDropAction, true, 0, nPage, nLayer ) ) nRet = nDropAction; // special insert? @@ -763,7 +763,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar // insert as clip action => jump OUString aBookmark( aINetBookmark.GetURL() ); SdAnimationInfo* pInfo = mrDoc.GetAnimationInfo( pPickObj ); - sal_Bool bCreated = sal_False; + bool bCreated = false; if( !aBookmark.isEmpty() ) { @@ -785,7 +785,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pInfo ) { pInfo = SdDrawDocument::GetShapeUserData( *pPickObj, true ); - bCreated = sal_True; + bCreated = true; } // create undo action with old and new sizes @@ -871,9 +871,9 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv /* In order t ensure unique page names, we test the ones we want to insert. If necessary. we put them into and replacement list (bNameOK == sal_False -> User canceled). */ - sal_Bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? sal_True : sal_False ); - sal_Bool bNameOK = GetExchangeList( aExchangeList, aBookmarkList, 2 ); - sal_Bool bReplace = sal_False; + bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? sal_True : sal_False ); + bool bNameOK = GetExchangeList( aExchangeList, aBookmarkList, 2 ); + bool bReplace = false; /* Since we don't know the type (page or object), we fill a list with pages and objects. @@ -882,9 +882,9 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv if( bNameOK ) { mrDoc.InsertBookmark( aBookmarkList, aExchangeList, - bLink, bReplace, nPgPos, sal_False, + bLink, bReplace, nPgPos, false, &pPageObjsTransferable->GetDocShell(), - sal_True, &aPos ); + true, &aPos ); } } @@ -959,9 +959,9 @@ typedef std::vector< SdrObject* > SdrObjectVector; void ImplProcessObjectList(SdrObject* pObj, SdrObjectVector& rVector ) { - sal_Bool bIsGroup(pObj->IsGroupObject()); + bool bIsGroup(pObj->IsGroupObject()); if(bIsGroup && pObj->ISA(E3dObject) && !pObj->ISA(E3dScene)) - bIsGroup = sal_False; + bIsGroup = false; rVector.push_back( pObj ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index f588d9f32180..cd95616977a3 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -254,8 +254,8 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo return true; } -sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, - const Point& rPos, sal_Int8& rDnDAction, sal_Bool bDrag, +bool View::InsertData( const TransferableDataHelper& rDataHelper, + const Point& rPos, sal_Int8& rDnDAction, bool bDrag, sal_uLong nFormat, sal_uInt16 nPage, sal_uInt16 nLayer ) { maDropPos = rPos; @@ -267,8 +267,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, SdPage* pPage = NULL; ImageMap* pImageMap = NULL; bool bReturn = false; - sal_Bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); - sal_Bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); + bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); + bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); sal_uLong nPasteOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh != NULL) @@ -377,7 +377,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( !pPV->IsLayerLocked( aLayer ) ) { - pOwnData->SetInternalMove( sal_True ); + pOwnData->SetInternalMove( true ); SortMarkedObjects(); for( sal_uLong nM = 0; nM < GetMarkedObjectCount(); nM++ ) @@ -405,12 +405,12 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, else { SdrPageView* pPV = GetSdrPageView(); - sal_Bool bDropOnTabBar = sal_True; + bool bDropOnTabBar = true; if( !pPage && pPV->GetPage()->GetPageNum() != mnDragSrcPgNum ) { pPage = (SdPage*) pPV->GetPage(); - bDropOnTabBar = sal_False; + bDropOnTabBar = false; } if( pPage ) @@ -586,7 +586,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } else { - pOwnData->SetInternalMove( sal_True ); + pOwnData->SetInternalMove( true ); MoveAllMarked( Size( maDropPos.X() - pOwnData->GetStartPos().X(), maDropPos.Y() - pOwnData->GetStartPos().Y() ), bCopy ); bReturn = true; @@ -611,7 +611,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, sal_Int32 nPos = aLayout.indexOf(SD_LT_SEPARATOR); if (nPos != -1) aLayout = aLayout.copy(0, nPos); - pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); + pPage->SetPresentationLayout( aLayout, false, false ); pSourceDoc->CreatingDataObj( NULL ); } else @@ -652,7 +652,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, sal_Int32 nPos = aLayout.indexOf(SD_LT_SEPARATOR); if (nPos != -1) aLayout = aLayout.copy(0, nPos); - pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); + pPage->SetPresentationLayout( aLayout, false, false ); } } @@ -662,7 +662,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) ) { - sal_Bool bChanged = sal_False; + bool bChanged = false; DrawDocShellRef xShell = new DrawDocShell(SFX_CREATE_MODE_INTERNAL); xShell->DoInitNew(0); @@ -731,7 +731,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { SdrObject::Free(pPickObj2 ); } - bChanged = sal_True; + bChanged = true; mnAction = DND_ACTION_COPY; } else if( ( mnAction & DND_ACTION_LINK ) && pPickObj && pObj && !pPickObj->ISA( SdrGrafObj ) && !pPickObj->ISA( SdrOle2Obj ) ) @@ -782,7 +782,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( bUndo ) EndUndo(); - bChanged = sal_True; + bChanged = true; } } } @@ -850,7 +850,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( mrDoc.GetDocSh() && ( mrDoc.GetDocSh()->GetClassName() == aObjDesc.maClassName ) ) { uno::Reference < embed::XStorage > xStore( ::comphelper::OStorageHelper::GetStorageFromInputStream( xStm ) ); - ::sd::DrawDocShellRef xDocShRef( new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, sal_True, mrDoc.GetDocumentType() ) ); + ::sd::DrawDocShellRef xDocShRef( new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, true, mrDoc.GetDocumentType() ) ); // mba: BaseURL doesn't make sense for clipboard functionality SfxMedium *pMedium = new SfxMedium( xStore, OUString() ); @@ -888,7 +888,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, sal_Int32 nPos = aLayout.indexOf(SD_LT_SEPARATOR); if (nPos != -1) aLayout = aLayout.copy(0, nPos); - pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); + pPage->SetPresentationLayout( aLayout, false, false ); } xDocShRef->DoClose(); @@ -1313,7 +1313,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, Color aColor( rColItem.GetColorValue() ); OUString aName( rColItem.GetName() ); SfxItemSet aSet( mrDoc.GetPool() ); - sal_Bool bClosed = pPickObj->IsClosedObj(); + bool bClosed = pPickObj->IsClosedObj(); ::sd::Window* pWin = mpViewSh->GetActiveWindow(); sal_uInt16 nHitLog = (sal_uInt16) pWin->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 04a3c8595ce1..2802435f4a03 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -196,7 +196,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), true ); sal_uLong nOptions = SDRINSERT_SETDEFLAYER; - sal_Bool bIsPresTarget = sal_False; + bool bIsPresTarget = false; if ((mpViewSh && mpViewSh->GetViewShell()!=NULL @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) { OUString aCurrentDropFile( *aIter ); INetURLObject aURL( aCurrentDropFile ); - sal_Bool bOK = sal_False; + bool bOK = false; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -434,7 +434,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( aIter == maDropFileVector.begin() ) mnAction = nTempAction; - bOK = sal_True; + bOK = true; } if( !bOK ) { @@ -469,7 +469,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) aReq.AppendItem( aItem1 ); aReq.AppendItem( aItem2 ); FuInsertFile::Create( mpViewSh, pWin, this, &mrDoc, aReq ); - bOK = sal_True; + bOK = true; } } } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index a23c31c840be..3f0dca33cc0e 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -594,9 +594,9 @@ void Window::SetMinZoomAutoCalc (bool bAuto) * If aWinPos.X()/Y() == -1, then we center the corresponding position (e.g. for * initialization). */ -void Window::UpdateMapOrigin(sal_Bool bInvalidate) +void Window::UpdateMapOrigin(bool bInvalidate) { - sal_Bool bChanged = sal_False; + bool bChanged = false; const Size aWinSize = PixelToLogic(GetOutputSizePixel()); if ( mbCenterAllowed ) @@ -607,28 +607,28 @@ void Window::UpdateMapOrigin(sal_Bool bInvalidate) // resizes maWinPos.X() -= (aWinSize.Width() - maPrevSize.Width()) / 2; maWinPos.Y() -= (aWinSize.Height() - maPrevSize.Height()) / 2; - bChanged = sal_True; + bChanged = true; } if ( maWinPos.X() > maViewSize.Width() - aWinSize.Width() ) { maWinPos.X() = maViewSize.Width() - aWinSize.Width(); - bChanged = sal_True; + bChanged = true; } if ( maWinPos.Y() > maViewSize.Height() - aWinSize.Height() ) { maWinPos.Y() = maViewSize.Height() - aWinSize.Height(); - bChanged = sal_True; + bChanged = true; } if ( aWinSize.Width() > maViewSize.Width() || maWinPos.X() < 0 ) { maWinPos.X() = maViewSize.Width() / 2 - aWinSize.Width() / 2; - bChanged = sal_True; + bChanged = true; } if ( aWinSize.Height() > maViewSize.Height() || maWinPos.Y() < 0 ) { maWinPos.Y() = maViewSize.Height() / 2 - aWinSize.Height() / 2; - bChanged = sal_True; + bChanged = true; } } @@ -718,7 +718,7 @@ void Window::SetVisibleXY(double fX, double fY) maWinPos.X() = (long) (fX * maViewSize.Width()); if ( fY >= 0 ) maWinPos.Y() = (long) (fY * maViewSize.Height()); - UpdateMapOrigin(sal_False); + UpdateMapOrigin(false); Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN); Update(); } @@ -916,7 +916,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( true ) ); } } @@ -931,7 +931,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( true ) ); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 77cccb63dc79..97c76b6d1932 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -81,7 +81,7 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : DropTargetHelper( this ), RrePageID(1), pDrViewSh(pViewSh), - bInternalMove(sal_False) + bInternalMove(false) { EnableEditMode(); SetSizePixel(Size(0, 0)); @@ -164,7 +164,7 @@ void TabControl::DoubleClick() void TabControl::StartDrag( sal_Int8, const Point& ) { - bInternalMove = sal_True; + bInternalMove = true; // object is delete by reference mechanismn ( new TabControl::TabControlTransferable( *this ) )->StartDrag( this, DND_ACTION_COPYMOVE ); @@ -173,7 +173,7 @@ void TabControl::StartDrag( sal_Int8, const Point& ) void TabControl::DragFinished( sal_Int8 ) { - bInternalMove = sal_False; + bInternalMove = false; } @@ -299,7 +299,7 @@ void TabControl::Command(const CommandEvent& rCEvt) if ( nCmd == COMMAND_CONTEXTMENU ) { - sal_Bool bGraphicShell = pDrViewSh->ISA(GraphicViewShell); + bool bGraphicShell = pDrViewSh->ISA(GraphicViewShell); sal_uInt16 nResId = bGraphicShell ? RID_GRAPHIC_PAGETAB_POPUP : RID_DRAW_PAGETAB_POPUP; SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); @@ -309,11 +309,11 @@ void TabControl::Command(const CommandEvent& rCEvt) long TabControl::StartRenaming() { - sal_Bool bOK = sal_False; + bool bOK = false; if (pDrViewSh->GetPageKind() == PK_STANDARD) { - bOK = sal_True; + bOK = true; ::sd::View* pView = pDrViewSh->GetView(); @@ -321,12 +321,12 @@ long TabControl::StartRenaming() pView->SdrEndTextEdit(); } - return( bOK ); + return bOK ? 1 : 0; } long TabControl::AllowRenaming() { - sal_Bool bOK = sal_True; + bool bOK = true; OUString aNewName( GetEditText() ); OUString aCompareName( GetPageText( GetEditPageId() ) ); @@ -341,10 +341,10 @@ long TabControl::AllowRenaming() } else { - bOK = sal_False; + bOK = false; } } - return( bOK ); + return bOK ? 1 : 0; } void TabControl::EndRenaming() @@ -365,7 +365,7 @@ void TabControl::ActivatePage() long TabControl::DeactivatePage() { - return pDrViewSh->IsSwitchPageAllowed(); + return pDrViewSh->IsSwitchPageAllowed() ? 1 : 0; } diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 7775201c2c76..e7af9b07c20e 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -41,8 +41,8 @@ ModifyPageUndoAction::ModifyPageUndoAction( SdPage* pThePage, const OUString& aTheNewName, AutoLayout eTheNewAutoLayout, - sal_Bool bTheNewBckgrndVisible, - sal_Bool bTheNewBckgrndObjsVisible) + bool bTheNewBckgrndVisible, + bool bTheNewBckgrndObjsVisible) : SdUndoAction(pTheDoc) { DBG_ASSERT(pThePage, "Undo without a page???"); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 7c319ba9944c..5f98d68ba8f4 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -250,7 +250,7 @@ long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll) return 0; } -SvxRuler* ViewShell::CreateHRuler(::sd::Window* , sal_Bool ) +SvxRuler* ViewShell::CreateHRuler(::sd::Window* , bool ) { return NULL; } @@ -413,7 +413,7 @@ void ViewShell::SetZoomRect(const Rectangle& rZoomRect) * Initialize imaging parameters for all split windows. */ void ViewShell::InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, sal_Bool bUpdate) + const Point& rWinPos, bool bUpdate) { if (mpContentWindow.get() != NULL) { @@ -462,9 +462,9 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, - long nUpper, long nLower, sal_Bool bScaleAll, + long nUpper, long nLower, bool bScaleAll, Orientation eOrientation, sal_uInt16 nPaperBin, - sal_Bool bBackgroundFullSize) + bool bBackgroundFullSize) { SdPage* pPage = 0; SdUndoGroup* pUndoGroup = NULL; @@ -577,7 +577,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, // adjust handout page to new format of the standard page if( (ePageKind == PK_STANDARD) || (ePageKind == PK_HANDOUT) ) - GetDoc()->GetSdPage(0, PK_HANDOUT)->CreateTitleAndLayout(sal_True); + GetDoc()->GetSdPage(0, PK_HANDOUT)->CreateTitleAndLayout(true); // handed over undo group to undo manager pViewShell->GetViewFrame()->GetObjectShell() @@ -589,7 +589,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, Point aPageOrg = Point(nWidth, nHeight / 2); Size aViewSize = Size(nWidth * 3, nHeight * 2); - InitWindows(aPageOrg, aViewSize, Point(-1, -1), sal_True); + InitWindows(aPageOrg, aViewSize, Point(-1, -1), true); Point aVisAreaPos; @@ -669,9 +669,9 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin) -sal_Bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) +bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (rHEvt.GetMode()) { @@ -730,12 +730,12 @@ void ViewShell::WriteFrameViewData() } -sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) +bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { ErrCode aErrCode = 0; SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX); - sal_Bool bAbort = sal_False; + bool bAbort = false; GetDocSh()->SetWaitCursor( true ); SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); @@ -786,7 +786,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) if (!xObj.is()) { - bAbort = sal_True; + bAbort = true; } } @@ -924,7 +924,7 @@ void ViewShell::WriteUserData(OUString&) /** * Switch ruler on/off */ -void ViewShell::SetRuler(sal_Bool bRuler) +void ViewShell::SetRuler(bool bRuler) { mbHasRulers = ( bRuler && !GetDocSh()->IsPreview() ); // no rulers on preview mode @@ -981,8 +981,7 @@ sal_Int8 ViewShell::ExecuteDrop ( return( pView ? pView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE ); } -void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse) +void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse) { const sal_Int32 nIndex = rSequence.getLength(); rSequence.realloc( nIndex + 1 ); @@ -1003,7 +1002,7 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < } -void ViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { mpFrameView->ReadUserDataSequence( rSequence, bBrowse ); } diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 35e5751e9cf2..e5205c4c1b54 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -129,13 +129,13 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_UNDO)) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(sal_False); + bool bActivate(false); if(pUndoManager) { if(pUndoManager->GetUndoActionCount() != 0) { - bActivate = sal_True; + bActivate = true; } } @@ -156,13 +156,13 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_REDO)) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(sal_False); + bool bActivate(false); if(pUndoManager) { if(pUndoManager->GetRedoActionCount() != 0) { - bActivate = sal_True; + bActivate = true; } } @@ -216,8 +216,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( OUString aNotesPageName; AutoLayout eStandardLayout (AUTOLAYOUT_NONE); AutoLayout eNotesLayout (AUTOLAYOUT_NOTES); - sal_Bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); - sal_Bool bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj); + bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); + bool bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj); // 1. Process the arguments. const SfxItemSet* pArgs = rRequest.GetArgs(); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ca89e24e3774..eaa950385de2 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -113,7 +113,7 @@ private: namespace sd { -sal_Bool ViewShell::IsPageFlipMode(void) const +bool ViewShell::IsPageFlipMode(void) const { return this->ISA(DrawViewShell) && mpContentWindow.get() != NULL && mpContentWindow->GetVisibleHeight() >= 1.0; @@ -180,7 +180,7 @@ void ViewShell::construct(void) mpView = 0; mpFrameView = 0; mpZoomList = 0; - mbStartShowWithDialog = sal_False; + mbStartShowWithDialog = false; mnPrintedHandoutPageNum = 1; mnPrintedHandoutPageCount = 0; mpWindowUpdater.reset( new ::sd::WindowUpdater() ); @@ -222,7 +222,7 @@ void ViewShell::construct(void) OUString aName( "ViewShell" ); SetName (aName); - GetDoc()->StartOnlineSpelling(sal_False); + GetDoc()->StartOnlineSpelling(false); mpWindowUpdater->SetViewShell (*this); mpWindowUpdater->SetDocument (GetDoc()); @@ -341,7 +341,7 @@ void ViewShell::Activate(bool bIsMDIActivate) } if(!GetDocSh()->IsUIActive()) - UpdatePreview( GetActualPage(), sal_True ); + UpdatePreview( GetActualPage(), true ); } @@ -416,9 +416,9 @@ void ViewShell::Shutdown (void) -sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) +bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { - sal_Bool bReturn(sal_False); + bool bReturn(false); if(pWin) { @@ -430,7 +430,7 @@ sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) // give key input first to SfxViewShell to give CTRL+Key // (e.g. CTRL+SHIFT+'+', to front) priority. OSL_ASSERT (GetViewShell()!=NULL); - bReturn = (sal_Bool)GetViewShell()->KeyInput(rKEvt); + bReturn = GetViewShell()->KeyInput(rKEvt); } sal_Int32 OriCount = GetView()->GetMarkedObjectList().GetMarkCount(); @@ -458,7 +458,7 @@ sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } else { - bReturn = sal_True; + bReturn = true; } } } @@ -478,7 +478,7 @@ sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) && aKeyCode.GetCode() == KEY_R) { InvalidateWindows(); - bReturn = sal_True; + bReturn = true; } } @@ -594,7 +594,7 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { - sal_Bool bDone = HandleScrollCommand (rCEvt, pWin); + bool bDone = HandleScrollCommand (rCEvt, pWin); if( !bDone ) { @@ -736,7 +736,7 @@ void ViewShell::SetupRulers (void) } if ( mpHorizontalRuler.get() == NULL ) { - mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), sal_True)); + mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), true)); if ( mpHorizontalRuler.get() != NULL ) { mpHorizontalRuler->SetWinPos(nHRulerOfs); @@ -763,8 +763,8 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& return pTmpItem; else { - sal_Bool bOutliner = sal_False; - sal_Bool bTitle = sal_False; + bool bOutliner = false; + bool bTitle = false; if( mpView ) { @@ -779,10 +779,10 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: - bTitle = sal_True; + bTitle = true; break; case OBJ_OUTLINETEXT: - bOutliner = sal_True; + bOutliner = true; break; } } @@ -828,7 +828,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& } -sal_Bool ViewShell::HasRuler (void) +bool ViewShell::HasRuler (void) { return mbHasRulers; } @@ -1032,7 +1032,7 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab ) /** Tell the FmFormShell that the view shell is closing. Give it the oportunity to prevent that. */ -bool ViewShell::PrepareClose (sal_Bool bUI) +bool ViewShell::PrepareClose (bool bUI) { bool nResult = true; @@ -1046,7 +1046,7 @@ bool ViewShell::PrepareClose (sal_Bool bUI) -void ViewShell::UpdatePreview (SdPage*, sal_Bool ) +void ViewShell::UpdatePreview (SdPage*, bool ) { // Do nothing. After the actual preview has been removed, // OutlineViewShell::UpdatePreview() is the place where something @@ -1151,7 +1151,7 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const -void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) +void ViewShell::ImpSidUndo(bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); @@ -1200,7 +1200,7 @@ void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) -void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq) +void ViewShell::ImpSidRedo(bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 5a995ae7b3dc..d039977d405d 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -82,14 +82,14 @@ Rectangle ZoomList::GetPreviousZoomRect() return maRectangles[mnCurPos]; } -sal_Bool ZoomList::IsNextPossible() const +bool ZoomList::IsNextPossible() const { size_t nRectCount = maRectangles.size(); return nRectCount > 0 && mnCurPos < nRectCount - 1; } -sal_Bool ZoomList::IsPreviousPossible() const +bool ZoomList::IsPreviousPossible() const { return mnCurPos > 0; } |