diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-17 15:28:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-18 10:08:01 +0200 |
commit | db448b707601ea0172b023aa3ae54279f4f1de0d (patch) | |
tree | ea09c54d91057e5924af21386bc3300c82c02047 /sc/source/ui | |
parent | 27274ebe2375307f2f22bddb6fc38041107e83fc (diff) |
sal_Bool->bool
Change-Id: Ifa9fe7e2b24ac74f51341b5a86b5ff241b99459a
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/drawfunc/fuconarc.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconcustomshape.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconpol.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconrec.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconstr.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fumark.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fupoor.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fusel.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/futext.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/fuconarc.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fuconcustomshape.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fuconpol.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fuconrec.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fuconstr.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fuconuno.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fudraw.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fumark.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fupoor.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/fusel.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/futext.hxx | 2 |
22 files changed, 49 insertions, 49 deletions
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 2e2d1208a6c2..e22f8935946c 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -95,17 +95,17 @@ bool FuConstArc::MouseMove( const MouseEvent& rMEvt ) |* \************************************************************************/ -sal_Bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt ) +bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt ) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = false; + bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { pView->EndCreateObj( SDRCREATE_NEXTPOINT ); - bReturn = sal_True; + bReturn = true; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index ef4d59b1f940..62526ff76352 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -117,17 +117,17 @@ bool FuConstCustomShape::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = false; + bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { pView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = sal_True; + bReturn = true; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index be8b6f7ee4aa..4a77aafe201d 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -100,13 +100,13 @@ bool FuConstPolygon::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = false; - sal_Bool bSimple = false; + bool bReturn = false; + bool bSimple = false; SdrViewEvent aVEvt; (void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); @@ -115,11 +115,11 @@ sal_Bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) if (aVEvt.eEvent == SDREVENT_ENDCREATE) { - bReturn = sal_True; - bSimple = sal_True; // Doppelklick nicht weiterreichen + bReturn = true; + bSimple = true; // Doppelklick nicht weiterreichen } - sal_Bool bParent; + bool bParent; if (bSimple) bParent = FuConstruct::SimpleMouseButtonUp(rMEvt); else diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 0c74e40d6b7e..43a060830446 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -113,12 +113,12 @@ bool FuConstRectangle::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = false; + bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { @@ -141,7 +141,7 @@ sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) } } - bReturn = sal_True; + bReturn = true; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 96dd640392fb..f9bf8c362a70 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -212,12 +212,12 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = SimpleMouseButtonUp( rMEvt ); + bool bReturn = SimpleMouseButtonUp( rMEvt ); // Doppelklick auf Textobjekt? (->fusel) @@ -250,7 +250,7 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) Point aMousePixel = rMEvt.GetPosPixel(); pText->SetInEditMode( pObj, &aMousePixel ); } - bReturn = sal_True; + bReturn = true; } } } diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 673699e445c6..d784360cdaf6 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -98,17 +98,17 @@ bool FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = false; + bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { pView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = sal_True; + bReturn = true; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index ca5677f5044b..09a9615ee0f6 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -162,7 +162,7 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) +bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index 3727fd9dceaa..cdea6a38c32e 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -111,7 +111,7 @@ bool FuMarkRect::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) +bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -149,7 +149,7 @@ sal_Bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) // SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId ); // SC_MOD()->SetRefDialog( nId, pWnd ? sal_False : sal_True ); - return sal_True; + return true; } /************************************************************************* diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 7661d6546a13..2729c252474c 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -141,7 +141,7 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) // moved from inline to *.cxx -sal_Bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt) +bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index f520b3a5d988..4715a786eab6 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -373,13 +373,13 @@ bool FuSelection::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) +bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = FuDraw::MouseButtonUp(rMEvt); - sal_Bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); + bool bReturn = FuDraw::MouseButtonUp(rMEvt); + bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); SdrObject* pObj = NULL; SdrPageView* pPV = NULL; @@ -441,7 +441,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { pView->UnmarkAllObj(); pView->MarkObj(pObj,pPV,false,false); - return (sal_True); + return true; } } pView->EndDragObj( rMEvt.IsMod1() ); @@ -456,7 +456,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) FuText* pText = static_cast<FuText*>(pPoor); pText->StopDragMode(pObj ); } - bReturn = sal_True; + bReturn = true; } else if (pView->IsAction() ) { @@ -465,7 +465,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pView->EndAction(); if ( pView->AreObjectsMarked() ) { - bReturn = sal_True; + bReturn = true; /* if multi-selection contains a note caption object, remove all other objects from selection. */ @@ -560,13 +560,13 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) Point aMousePixel = rMEvt.GetPosPixel(); pText->SetInEditMode( pObj, &aMousePixel ); } - bReturn = sal_True; + bReturn = true; } } } } else if ( TestDetective( pView->GetSdrPageView(), aPnt ) ) - bReturn = sal_True; + bReturn = true; } // Ein VCControl ist aktiv @@ -600,7 +600,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) } } - return (bReturn); + return bReturn; } /************************************************************************* diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 2f99181d7576..4a3c68166041 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -428,12 +428,12 @@ bool FuText::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) +bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = false; + bool bReturn = false; if (aDragTimer.IsActive() ) { @@ -445,7 +445,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if ( pView->MouseButtonUp(rMEvt, pWindow) ) - return (sal_True); // Event von der SdrView ausgewertet + return true; // Event von der SdrView ausgewertet if ( pView->IsDragObj() ) { @@ -553,7 +553,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) } } - return (bReturn); + return bReturn; } /************************************************************************* diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index d321395aa10a..5a73ec989f1a 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -33,7 +33,7 @@ class FuConstArc : public FuConstruct // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 2715d2b9822d..bb44e71fb225 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -36,7 +36,7 @@ public: // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index 527eff5efc9d..665892a34aa1 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -35,7 +35,7 @@ class FuConstPolygon : public FuConstruct // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index c78adf550e00..8d4f1b248616 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -33,7 +33,7 @@ class FuConstRectangle : public FuConstruct // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 62ea7bd975cd..e001e843d8db 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -34,7 +34,7 @@ class FuConstruct : public FuDraw // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual sal_uInt8 Command(const CommandEvent& rCEvt); diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 76a8a989975a..f5d2b9489dd3 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -38,7 +38,7 @@ public: // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index e666bdde31be..fa5b1c5127d0 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -43,7 +43,7 @@ class FuDraw : public FuPoor virtual void ForcePointer(const MouseEvent* pMEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); // II diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index 73f26d4bb3a4..274b997d7bf2 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -47,7 +47,7 @@ class FuMarkRect : public FuPoor virtual void ForcePointer(const MouseEvent* pMEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual sal_uInt8 Command(const CommandEvent& rCEvt); }; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index a65a6db489c8..d0905e0373c6 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -85,7 +85,7 @@ public: virtual bool MouseMove(const MouseEvent&) { return false; } // moved from inline to *.cxx - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; } + virtual bool MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; } // moved from inline to *.cxx virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); // { return FALSE; } diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index d754261f2d66..789901102876 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -35,7 +35,7 @@ public: // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual sal_uInt8 Command(const CommandEvent& rCEvt); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index e47292b3ab5f..ee7fccf36126 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -42,7 +42,7 @@ public: virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); |