[Libreoffice-commits] core.git: sc/source
Thomas Beck
thomas.beck at cib.de
Fri May 19 10:46:43 UTC 2017
sc/source/ui/drawfunc/fuconarc.cxx | 24 ------------
sc/source/ui/drawfunc/fuconcustomshape.cxx | 30 ----------------
sc/source/ui/drawfunc/fuconpol.cxx | 30 ----------------
sc/source/ui/drawfunc/fuconrec.cxx | 25 -------------
sc/source/ui/drawfunc/fuconstr.cxx | 38 --------------------
sc/source/ui/drawfunc/fuconuno.cxx | 24 ------------
sc/source/ui/drawfunc/fudraw.cxx | 54 +----------------------------
sc/source/ui/drawfunc/fuins1.cxx | 24 ------------
sc/source/ui/drawfunc/fupoor.cxx | 30 ++--------------
sc/source/ui/drawfunc/fusel.cxx | 44 ++---------------------
10 files changed, 12 insertions(+), 311 deletions(-)
New commits:
commit 575b457d728531a1cfff95d2eea1887e09d79009
Author: Thomas Beck <thomas.beck at cib.de>
Date: Thu May 18 12:54:31 2017 +0200
Removed unneccessary ASCII-Art and comments
Change-Id: I455d7aa7c6e6313a0d24137e02b7bf04ede9aae9
Reviewed-on: https://gerrit.libreoffice.org/37752
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 988cff764e82..2dd3aeb0fb7e 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -36,12 +36,6 @@ FuConstArc::~FuConstArc()
{
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
{
// remember button state for creation of own MouseEvents
@@ -65,12 +59,6 @@ bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
{
// remember button state for creation of own MouseEvents
@@ -86,12 +74,6 @@ bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
-/*************************************************************************
-|*
-|* Activate function
-|*
-\************************************************************************/
-
void FuConstArc::Activate()
{
SdrObjKind aObjKind;
@@ -127,12 +109,6 @@ void FuConstArc::Activate()
FuDraw::Activate();
}
-/*************************************************************************
-|*
-|* Deactivate functions
-|*
-\************************************************************************/
-
void FuConstArc::Deactivate()
{
FuDraw::Deactivate();
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index a69037136f92..54d8470229f6 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -52,12 +52,6 @@ FuConstCustomShape::~FuConstCustomShape()
{
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -93,12 +87,6 @@ bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -114,12 +102,6 @@ bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
-/*************************************************************************
-|*
-|* Activate function
-|*
-\************************************************************************/
-
void FuConstCustomShape::Activate()
{
pView->SetCurrentObj( OBJ_CUSTOMSHAPE );
@@ -135,12 +117,6 @@ void FuConstCustomShape::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Deactivate function
-|*
-\************************************************************************/
-
void FuConstCustomShape::Deactivate()
{
FuConstruct::Deactivate();
@@ -169,12 +145,6 @@ SdrObject* FuConstCustomShape::CreateDefaultObject(const sal_uInt16 /* nID */, c
return pObj;
}
-/*************************************************************************
-|*
-|* applying attributes
-|*
-\************************************************************************/
-
void FuConstCustomShape::SetAttributes( SdrObject* pObj )
{
bool bAttributesAppliedFromGallery = false;
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index c7e2717e1f5b..37b836614f98 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -37,12 +37,6 @@ FuConstPolygon::~FuConstPolygon()
{
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -69,24 +63,12 @@ bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
-
bool FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
{
pView->MouseMove(rMEvt, pWindow);
return FuConstruct::MouseMove(rMEvt);
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -115,12 +97,6 @@ bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
return (bParent || bReturn);
}
-/*************************************************************************
-|*
-|* Activate function
-|*
-\************************************************************************/
-
void FuConstPolygon::Activate()
{
pView->EnableExtendedMouseEventDispatcher(true);
@@ -185,12 +161,6 @@ void FuConstPolygon::Activate()
pViewShell->SetActivePointer( aNewPointer );
}
-/*************************************************************************
-|*
-|* Deactivate function
-|*
-\************************************************************************/
-
void FuConstPolygon::Deactivate()
{
pView->SetEditMode(SdrViewEditMode::Edit);
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 728c63c59df9..d9e476260573 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -83,12 +83,6 @@ namespace {
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -132,12 +126,6 @@ bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -171,12 +159,6 @@ bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
-/*************************************************************************
-|*
-|* Activate function
-|*
-\************************************************************************/
-
void FuConstRectangle::Activate()
{
SdrObjKind aObjKind;
@@ -363,13 +345,6 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
}
}
-
-/*************************************************************************
-|*
-|* Deactivate function
-|*
-\************************************************************************/
-
void FuConstRectangle::Deactivate()
{
FuConstruct::Deactivate();
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index f05076cb8499..9e0a46337638 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -36,24 +36,12 @@
//! fusel,fuconstr,futext - combine them!
#define SC_MAXDRAGMOVE 3
-/*************************************************************************
-|*
-|* ctor
-|*
-\************************************************************************/
-
FuConstruct::FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq) :
FuDraw(pViewSh, pWin, pViewP, pDoc, rReq)
{
}
-/*************************************************************************
-|*
-|* dtor
-|*
-\************************************************************************/
-
FuConstruct::~FuConstruct()
{
}
@@ -98,11 +86,6 @@ Point FuConstruct::CurrentGridSyncOffsetAndPos( Point& rInOutPos )
}
return aRetGridOff;
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
{
@@ -145,12 +128,6 @@ bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
-
bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
{
FuDraw::MouseMove(rMEvt);
@@ -198,12 +175,6 @@ bool FuConstruct::MouseMove(const MouseEvent& rMEvt)
return true;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -293,14 +264,7 @@ bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* Handle keyboard events
-|*
-|* If we handle a KeyEvent, then the return value is sal_True else FALSE.
-|*
-\************************************************************************/
-
+// If we handle a KeyEvent, then the return value is sal_True else FALSE.
bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
{
bool bReturn = false;
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 0963da5ed74c..7ec13faf3cc5 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -40,12 +40,6 @@ FuConstUnoControl::~FuConstUnoControl()
{
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -70,12 +64,6 @@ bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -91,12 +79,6 @@ bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
-/*************************************************************************
-|*
-|* Activate function
-|*
-\************************************************************************/
-
void FuConstUnoControl::Activate()
{
pView->SetCurrentObj( nIdentifier, nInventor );
@@ -112,12 +94,6 @@ void FuConstUnoControl::Activate()
FuConstruct::Activate();
}
-/*************************************************************************
-|*
-|* Deactivate function
-|*
-\************************************************************************/
-
void FuConstUnoControl::Deactivate()
{
FuConstruct::Deactivate();
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index ef4f06d41784..ce68e1f9cb67 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -41,12 +41,7 @@
#include "globstr.hrc"
#include "drawview.hxx"
-/*************************************************************************
-|*
-|* base class for draw module specific functions
-|*
-\************************************************************************/
-
+// base class for draw module specific functions
FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq) :
FuPoor (pViewSh, pWin, pViewP, pDoc, rReq),
@@ -55,22 +50,10 @@ FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
{
}
-/*************************************************************************
-|*
-|* destructor
-|*
-\************************************************************************/
-
FuDraw::~FuDraw()
{
}
-/*************************************************************************
-|*
-|* evaluate modifier keys
-|*
-\************************************************************************/
-
void FuDraw::DoModifiers(const MouseEvent& rMEvt)
{
// Shift = Ortho and AngleSnap
@@ -128,12 +111,6 @@ void FuDraw::ResetModifiers()
pView->SetResizeAtCenter(false);
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -143,12 +120,6 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
return false;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
-
bool FuDraw::MouseMove(const MouseEvent& rMEvt)
{
// evaluate modifiers only if in a drawing layer action
@@ -159,12 +130,6 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt)
return false;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -174,15 +139,7 @@ bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
return false;
}
-/*************************************************************************
-|*
-|* process keyboard events
-|*
-|* if a keyevent is processed -> returns sal_True
-|* -> else FALSE
-|*
-\************************************************************************/
-
+// Process Keyboard events. Return true if an event is being handled
static bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey )
{
bool bReturn = false;
@@ -664,12 +621,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* toggle mouse-pointer
-|*
-\************************************************************************/
-
+// toggle mouse-pointer
static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWindow )
{
SdrViewEvent aVEvt;
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 7a7092536640..3c9c5bcfb862 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -218,12 +218,6 @@ static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi,
pView->InsertObjectAtView( pObj, *pPV, bApi ? SdrInsertFlags::DONTMARK : SdrInsertFlags::NONE );
}
-/*************************************************************************
-|*
-|* FuInsertGraphic::Constructor
-|*
-\************************************************************************/
-
FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
vcl::Window* pWin,
ScDrawView* pViewP,
@@ -291,22 +285,10 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
}
}
-/*************************************************************************
-|*
-|* FuInsertGraphic::Destructor
-|*
-\************************************************************************/
-
FuInsertGraphic::~FuInsertGraphic()
{
}
-/*************************************************************************
-|*
-|* FuInsertMedia::Constructor
-|*
-\************************************************************************/
-
FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
vcl::Window* pWin,
ScDrawView* pViewP,
@@ -357,12 +339,6 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
}
}
-/*************************************************************************
-|*
-|* FuInsertMedia::Destructor
-|*
-\************************************************************************/
-
FuInsertMedia::~FuInsertMedia()
{
}
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 915590a724b9..393e6f4a16dc 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -75,12 +75,7 @@ void FuPoor::Deactivate()
}
}
-/*************************************************************************
-|*
-|* Scroll when reached the window border; is called from MouseMove
-|*
-\************************************************************************/
-
+// Scroll when reached the window border; is called from MouseMove
void FuPoor::ForceScroll(const Point& aPixPos)
{
aScrollTimer.Stop();
@@ -145,14 +140,7 @@ bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
return false;
}
-/*************************************************************************
-|*
-|* Handle keyboard events
-|*
-|* If we handle a KeyEvent, then the return value is sal_True else FALSE.
-|*
-\************************************************************************/
-
+// If we handle a KeyEvent, then the return value is sal_True else FALSE.
bool FuPoor::KeyInput(const KeyEvent& /* rKEvt */)
{
return false;
@@ -176,11 +164,7 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
return pView->Command(rCEvt,pWindow) ? 1 : 0;
}
-/*************************************************************************
-|*
-|* Timer-Handler for Drag&Drop
-|*
-\************************************************************************/
+// Timer-Handler for Drag&Drop
IMPL_LINK_NOARG(FuPoor, DragTimerHdl, Timer *, void)
{
// Calling ExecuteDrag (and that associated reschedule) directly from
@@ -206,7 +190,6 @@ IMPL_LINK_NOARG(FuPoor, DragHdl, void*, void)
}
// Detective-line
-
bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
{
SdrPageView* pPV = pView->GetSdrPageView();
@@ -239,12 +222,7 @@ void FuPoor::StopDragTimer()
aDragTimer.Stop();
}
-/*************************************************************************
-|*
-|* Create default drawing objects via keyboard
-|*
-\************************************************************************/
-
+// Create default drawing objects via keyboard
SdrObject* FuPoor::CreateDefaultObject(const sal_uInt16 /* nID */, const tools::Rectangle& /* rRectangle */)
{
// empty base implementation
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 54fc57cfc8b9..f7db2b9c8a04 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -57,34 +57,16 @@
using namespace com::sun::star;
-/*************************************************************************
-|*
-|* ctor
-|*
-\************************************************************************/
-
FuSelection::FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq ) :
FuDraw(pViewSh, pWin, pViewP, pDoc, rReq)
{
}
-/*************************************************************************
-|*
-|* dtor
-|*
-\************************************************************************/
-
FuSelection::~FuSelection()
{
}
-/*************************************************************************
-|*
-|* MouseButtonDown-event
-|*
-\************************************************************************/
-
bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -314,12 +296,6 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseMove-event
-|*
-\************************************************************************/
-
bool FuSelection::MouseMove(const MouseEvent& rMEvt)
{
bool bReturn = FuDraw::MouseMove(rMEvt);
@@ -348,12 +324,6 @@ bool FuSelection::MouseMove(const MouseEvent& rMEvt)
return bReturn;
}
-/*************************************************************************
-|*
-|* MouseButtonUp-event
-|*
-\************************************************************************/
-
bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -383,9 +353,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
if ( pView->IsDragObj() )
{
- /******************************************************************
- * object was moved
- ******************************************************************/
+ // object was moved
if ( rMEvt.IsMod1() )
{
if ( pPage )
@@ -413,10 +381,8 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
std::abs(aPnt.X() - aMDPos.X()) < nDrgLog &&
std::abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
{
- /*************************************************************
- * If a user wants to click on an object in front of a marked
- * one, he releases the mouse button immediately
- **************************************************************/
+ /* If a user wants to click on an object in front of a marked
+ one, he releases the mouse button immediately */
SdrPageView* pPV = nullptr;
pObj = pView->PickObj(aMDPos, pView->getHitTolLog(), pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK);
if (pObj)
@@ -462,9 +428,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- /**************************************************************************
- * maybe consider OLE object
- **************************************************************************/
+ // maybe consider OLE object
SfxInPlaceClient* pIPClient = pViewShell ? pViewShell->GetIPClient() : nullptr;
if (pIPClient)
More information about the Libreoffice-commits
mailing list