diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-10 11:09:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:24 +0200 |
commit | 6c97bc47177adc1c51f69f17e77b9fe2aeade122 (patch) | |
tree | f0ae47f9be3c2a72b3b197681ca65644bf82ecfe /sc/source/ui | |
parent | d1bffe3596d21f205cb7a2697bb5142f190b5627 (diff) |
svx: sal_Bool->bool
Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/drawfunc/drawsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconpol.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/futext.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/drawview.hxx | 24 | ||||
-rw-r--r-- | sc/source/ui/view/drawview.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/view/notemark.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabview5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh2.cxx | 2 |
12 files changed, 38 insertions, 38 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 30e1e7630ec4..9543614def5e 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -121,7 +121,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_TEXT_STANDARD: // Harte Textattributierung loeschen { SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END); - pView->SetAttributes(aEmptyAttr, sal_True); + pView->SetAttributes(aEmptyAttr, true); } break; diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 1d39426d5025..7ff85f14e5a6 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -140,7 +140,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl // call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked) // is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method. - if (!pView->IsMirrorAllowed(sal_True,sal_True)) + if (!pView->IsMirrorAllowed(true,true)) { rSet.DisableItem( SID_MIRROR_HORIZONTAL ); rSet.DisableItem( SID_MIRROR_VERTICAL ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 4370c18e826a..52e524dcf3a6 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -408,7 +408,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate( SID_OBJECT_MIRROR ); if (eMode == SDRDRAG_ROTATE && !pView->IsFrameDragSingles()) { - pView->SetFrameDragSingles( sal_True ); + pView->SetFrameDragSingles( true ); rBindings.Invalidate( SID_BEZIER_EDIT ); } } @@ -425,7 +425,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate( SID_OBJECT_MIRROR ); if (eMode == SDRDRAG_MIRROR && !pView->IsFrameDragSingles()) { - pView->SetFrameDragSingles( sal_True ); + pView->SetFrameDragSingles( true ); rBindings.Invalidate( SID_BEZIER_EDIT ); } } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index db575fc90a27..1bb6833a9fcd 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -785,7 +785,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) pOutView->Paint( Rectangle() ); SfxItemSet aEmptyAttr( *aEditAttr.GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - pView->SetAttributes( aEmptyAttr, sal_True ); + pView->SetAttributes( aEmptyAttr, true ); if ( pOutView ) { diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index a3d00092ff47..12183dd164bf 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -73,7 +73,7 @@ bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) } else { - pView->EnableExtendedMouseEventDispatcher(sal_True); + pView->EnableExtendedMouseEventDispatcher(true); } if ( pView->MouseButtonDown(rMEvt, pWindow) ) @@ -150,7 +150,7 @@ bool FuConstPolygon::KeyInput(const KeyEvent& rKEvt) void FuConstPolygon::Activate() { - pView->EnableExtendedMouseEventDispatcher(sal_True); + pView->EnableExtendedMouseEventDispatcher(true); SdrObjKind eKind; diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 4ded30bf1b4a..6d7df46c5a07 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -81,8 +81,8 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt) sal_Bool bAlt = rMEvt.IsMod2(); bool bOrtho = bShift; - sal_Bool bAngleSnap = bShift; - sal_Bool bCenter = bAlt; + bool bAngleSnap = bShift; + bool bCenter = bAlt; // #i33136# if(doConstructOrthogonal()) @@ -107,7 +107,7 @@ void FuDraw::ResetModifiers() ScViewData* pViewData = pViewShell->GetViewData(); const ScViewOptions& rOpt = pViewData->GetOptions(); const ScGridOptions& rGrid = rOpt.GetGridOptions(); - sal_Bool bGridOpt = rGrid.GetUseGridSnap(); + bool bGridOpt = rGrid.GetUseGridSnap(); if (pView->IsOrtho()) pView->SetOrtho(false); @@ -392,7 +392,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) { // mark first object pView->UnmarkAllObj(); - pView->MarkNextObj(sal_True); + pView->MarkNextObj(true); // II if(pView->AreObjectsMarked()) diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index a56f6c03a454..fed6aa1b2324 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -221,7 +221,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) pO->SetVertical( bVertical ); //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? - if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) ) + if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) ) { // EditEngine-UndoManager anmelden pViewShell->SetDrawTextUndo( &pO->GetUndoManager() ); @@ -504,7 +504,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) SdrTextObj* pText = (SdrTextObj*)pObj; SfxItemSet aSet(pDrDoc->GetItemPool()); - pText->SetVerticalWriting(sal_True); + pText->SetVerticalWriting(true); aSet.Put(SdrTextAutoGrowWidthItem(true)); aSet.Put(SdrTextAutoGrowHeightItem(false)); @@ -754,7 +754,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, pO->SetVertical( bVertical ); //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? - if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) ) + if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) ) { // EditEngine-UndoManager anmelden pViewShell->SetDrawTextUndo( &pO->GetUndoManager() ); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 2b7100a70e41..306c6f8ce7e7 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -70,18 +70,18 @@ public: virtual void DeleteMarked(); - virtual sal_Bool SdrBeginTextEdit( - SdrObject* pObj, - SdrPageView* pPV = 0L, - ::Window* pWin = 0L, - sal_Bool bIsNewObj = sal_False, - SdrOutliner* pGivenOutliner = 0L, - OutlinerView* pGivenOutlinerView = 0L, - sal_Bool bDontDeleteOutliner = sal_False, - sal_Bool bOnlyOneView = sal_False, - sal_Bool bGrabFocus = sal_True); - - virtual SdrEndTextEditKind SdrEndTextEdit( sal_Bool bDontDeleteReally = sal_False ); + virtual bool SdrBeginTextEdit( + SdrObject* pObj, + SdrPageView* pPV = 0L, + ::Window* pWin = 0L, + bool bIsNewObj = false, + SdrOutliner* pGivenOutliner = 0L, + OutlinerView* pGivenOutlinerView = 0L, + bool bDontDeleteOutliner = false, + bool bOnlyOneView = false, + bool bGrabFocus = true); + + virtual SdrEndTextEditKind SdrEndTextEdit( bool bDontDeleteReally = false ); void MarkDropObj( SdrObject* pObj ); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index ea82c505cd80..c2def963ea64 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -91,7 +91,7 @@ void ScDrawView::Construct() SetLayerLocked( pLayer->GetName(), bProt || !bEx ); pLayer = rAdmin.GetLayerPerID(SC_LAYER_INTERN); if (pLayer) - SetLayerLocked( pLayer->GetName(), sal_True ); + SetLayerLocked( pLayer->GetName(), true ); pLayer = rAdmin.GetLayerPerID(SC_LAYER_FRONT); if (pLayer) { @@ -108,7 +108,7 @@ void ScDrawView::Construct() SetLayerVisible( pLayer->GetName(), false); } - SetSwapAsynchron(sal_True); + SetSwapAsynchron(true); } else { @@ -540,16 +540,16 @@ void ScDrawView::MarkListHasChanged() } -sal_Bool ScDrawView::SdrBeginTextEdit( +bool ScDrawView::SdrBeginTextEdit( SdrObject* pObj, SdrPageView* pPV, ::Window* pWinL, - sal_Bool bIsNewObj, + bool bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, - sal_Bool bDontDeleteOutliner, - sal_Bool bOnlyOneView, - sal_Bool bGrabFocus ) + bool bDontDeleteOutliner, + bool bOnlyOneView, + bool bGrabFocus ) { const sal_Bool bRet = FmFormView::SdrBeginTextEdit( pObj, pPV, pWinL, bIsNewObj, @@ -573,7 +573,7 @@ sal_Bool ScDrawView::SdrBeginTextEdit( } -SdrEndTextEditKind ScDrawView::SdrEndTextEdit( sal_Bool bDontDeleteReally ) +SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) { const SdrEndTextEditKind eRet = FmFormView::SdrEndTextEdit( bDontDeleteReally ); @@ -707,7 +707,7 @@ bool ScDrawView::SelectCurrentViewObject( const OUString& rName ) { SdrLayer* pLayer = GetModel()->GetLayerAdmin().GetLayerPerID(SC_LAYER_BACK); if (pLayer) - SetLayerLocked( pLayer->GetName(), sal_False ); + SetLayerLocked( pLayer->GetName(), false ); } SdrPageView* pPV = GetSdrPageView(); bUnMark = IsObjMarked(pFound); diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 20c503a19b18..75e5cec3533a 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -80,7 +80,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) { SvtPathOptions aPathOpt; OUString aPath = aPathOpt.GetPalettePath(); - pModel = new SdrModel(aPath); + pModel = new SdrModel(aPath, NULL, NULL, false, false); pModel->SetScaleUnit(MAP_100TH_MM); SfxItemPool& rPool = pModel->GetItemPool(); rPool.SetDefaultMetric(SFX_MAPUNIT_100TH_MM); diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 25e771efca61..3564485d21ab 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -318,7 +318,7 @@ void ScTabView::UpdateLayerLocks() pDrawView->SetLayerLocked( pLayer->GetName(), bProt || !bEx || bShared ); pLayer = rAdmin.GetLayerPerID(SC_LAYER_INTERN); if (pLayer) - pDrawView->SetLayerLocked( pLayer->GetName(), sal_True ); + pDrawView->SetLayerLocked( pLayer->GetName(), true ); pLayer = rAdmin.GetLayerPerID(SC_LAYER_FRONT); if (pLayer) pDrawView->SetLayerLocked( pLayer->GetName(), bProt || bShared ); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index cf0ec07d2990..7b6855398080 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -213,7 +213,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) { // select first object pView->UnmarkAllObj(); - pView->MarkNextObj(sal_True); + pView->MarkNextObj(true); // ...and make it visible if(pView->AreObjectsMarked()) |