[Libreoffice-commits] core.git: 2 commits - vcl/source
Chris Sherlock
chris.sherlock79 at gmail.com
Mon Jan 25 00:40:30 PST 2016
vcl/source/window/dndeventdispatcher.cxx | 30 ---------------------
vcl/source/window/dndlistenercontainer.cxx | 40 -----------------------------
2 files changed, 70 deletions(-)
New commits:
commit 0406203eeca0ef5883f608566d4a0915f86a558b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Mon Jan 25 19:39:06 2016 +1100
vcl: remove comment cruft from dndeventcontainer.cxx
Change-Id: I55a3297916df9cb4f380f29299e7555e6aed7979
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index 165ad27..9ca0a92 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -32,14 +32,12 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::dnd;
-// DNDEventDispatcher::DNDEventDispatcher
DNDEventDispatcher::DNDEventDispatcher( vcl::Window * pTopWindow ):
m_pTopWindow( pTopWindow ),
m_pCurrentWindow( nullptr )
{
}
-// DNDEventDispatcher::~DNDEventDispatcher
DNDEventDispatcher::~DNDEventDispatcher()
{
designate_currentwindow(nullptr);
@@ -87,7 +85,6 @@ void DNDEventDispatcher::designate_currentwindow(vcl::Window *pWindow)
m_pCurrentWindow->AddEventListener(LINK(this, DNDEventDispatcher, WindowEventListener));
}
-// DNDEventDispatcher::drop
void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
throw(RuntimeException, std::exception)
{
@@ -124,8 +121,6 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
m_aDataFlavorList.realloc( 0 );
}
-// DNDEventDispatcher::dragEnter
-
void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee )
throw(RuntimeException, std::exception)
{
@@ -150,8 +145,6 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd
}
-// DNDEventDispatcher::dragExit
-
void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ )
throw(RuntimeException, std::exception)
{
@@ -164,8 +157,6 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ )
m_aDataFlavorList.realloc( 0 );
}
-// DNDEventDispatcher::dragOver
-
void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
throw(RuntimeException, std::exception)
{
@@ -203,7 +194,6 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
}
}
-// DNDEventDispatcher::dropActionChanged
void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde )
throw(RuntimeException, std::exception)
{
@@ -241,8 +231,6 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent&
}
}
-// DNDEventDispatcher::dragGestureRecognized
-
void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge )
throw(RuntimeException, std::exception)
{
@@ -255,27 +243,19 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent&
fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction );
}
-// DNDEventDispatcher::disposing
-
void SAL_CALL DNDEventDispatcher::disposing( const EventObject& )
throw(RuntimeException, std::exception)
{
}
-// DNDEventDispatcher::acceptDrag
-
void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception)
{
}
-// DNDEventDispatcher::rejectDrag
-
void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception)
{
}
-// DNDEventDispatcher::fireDragEnterEvent
-
sal_Int32 DNDEventDispatcher::fireDragEnterEvent( vcl::Window *pWindow,
const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList
@@ -308,8 +288,6 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( vcl::Window *pWindow,
return n;
}
-// DNDEventDispatcher::fireDragOverEvent
-
sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow,
const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
const Point& rLocation, const sal_Int8 nSourceActions
@@ -339,8 +317,6 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow,
return n;
}
-// DNDEventDispatcher::fireDragExitEvent
-
sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow ) throw(RuntimeException)
{
sal_Int32 n = 0;
@@ -364,8 +340,6 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow ) throw(Ru
return n;
}
-// DNDEventDispatcher::fireDropActionChangedEvent
-
sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( vcl::Window *pWindow,
const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
const Point& rLocation, const sal_Int8 nSourceActions
@@ -395,8 +369,6 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( vcl::Window *pWindow,
return n;
}
-// DNDEventDispatcher::fireDropEvent
-
sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow,
const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation,
const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable
@@ -436,8 +408,6 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow,
return n;
}
-// DNDEventDispatcher::fireDragGestureRecognized
-
sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow,
const Reference< XDragSource >& xSource, const Any& event,
const Point& rOrigin, const sal_Int8 nDragAction
commit bc9636c4de82a6dc62b7e4312187c18098e008b2
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Mon Jan 25 19:37:36 2016 +1100
vcl: remove comment cruft from dndlistenercontainer.cxx
Change-Id: Ic59bb5efe7334879faf62b0f1f3df5924d6b9248
diff --git a/vcl/source/window/dndlistenercontainer.cxx b/vcl/source/window/dndlistenercontainer.cxx
index 76ef78d..b9874fc 100644
--- a/vcl/source/window/dndlistenercontainer.cxx
+++ b/vcl/source/window/dndlistenercontainer.cxx
@@ -35,79 +35,59 @@ DNDListenerContainer::~DNDListenerContainer()
{
}
-// DNDListenerContainer::addDragGestureListener
-
void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl )
throw(RuntimeException, std::exception)
{
rBHelper.addListener( cppu::UnoType<XDragGestureListener>::get(), dgl );
}
-// DNDListenerContainer::removeDragGestureListener
-
void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl )
throw(RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<XDragGestureListener>::get(), dgl );
}
-// DNDListenerContainer::resetRecognizer
-
void SAL_CALL DNDListenerContainer::resetRecognizer( )
throw(RuntimeException, std::exception)
{
}
-// DNDListenerContainer::addDropTargetListener
-
void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl )
throw(RuntimeException, std::exception)
{
rBHelper.addListener( cppu::UnoType<XDropTargetListener>::get(), dtl );
}
-// DNDListenerContainer::removeDropTargetListener
-
void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
throw(RuntimeException, std::exception)
{
rBHelper.removeListener( cppu::UnoType<XDropTargetListener>::get(), dtl );
}
-// DNDListenerContainer::isActive
-
sal_Bool SAL_CALL DNDListenerContainer::isActive( )
throw(RuntimeException, std::exception)
{
return m_bActive;
}
-// DNDListenerContainer::setActive
-
void SAL_CALL DNDListenerContainer::setActive( sal_Bool active )
throw(RuntimeException, std::exception)
{
m_bActive = active;
}
-// DNDListenerContainer::getDefaultActions
-
sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( )
throw(RuntimeException, std::exception)
{
return m_nDefaultActions;
}
-// DNDListenerContainer::setDefaultActions
-
void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions )
throw(RuntimeException, std::exception)
{
m_nDefaultActions = actions;
}
-// DNDListenerContainer::fireDropEvent
-
sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
const Reference< XTransferable >& transferable )
@@ -177,8 +157,6 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop
return nRet;
}
-// DNDListenerContainer::fireDragExitEvent
-
sal_uInt32 DNDListenerContainer::fireDragExitEvent()
{
sal_uInt32 nRet = 0;
@@ -219,8 +197,6 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent()
return nRet;
}
-// DNDListenerContainer::fireDragOverEvent
-
sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions )
{
@@ -282,8 +258,6 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
return nRet;
}
-// DNDListenerContainer::fireDragEnterEvent
-
sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTargetDragContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions,
const Sequence< DataFlavor >& dataFlavors )
@@ -346,8 +320,6 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge
return nRet;
}
-// DNDListenerContainer::fireDropActionChangedEvent
-
sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XDropTargetDragContext >& context,
sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions )
{
@@ -409,8 +381,6 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
return nRet;
}
-// DNDListenerContainer::fireDragGestureEvent
-
sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_Int32 dragOriginX,
sal_Int32 dragOriginY, const Reference< XDragSource >& dragSource, const Any& triggerEvent )
{
@@ -453,8 +423,6 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_
return nRet;
}
-// DNDListenerContainer::acceptDrag
-
void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception)
{
if( m_xDropTargetDragContext.is() )
@@ -464,30 +432,22 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (
}
}
-// DNDListenerContainer::rejectDrag
-
void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException, std::exception)
{
// nothing to do here
}
-// DNDListenerContainer::acceptDrop
-
void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception)
{
if( m_xDropTargetDropContext.is() )
m_xDropTargetDropContext->acceptDrop( dropOperation );
}
-// DNDListenerContainer::rejectDrop
-
void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException, std::exception)
{
// nothing to do here
}
-// DNDListenerContainer::dropComplete
-
void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception)
{
if( m_xDropTargetDropContext.is() )
More information about the Libreoffice-commits
mailing list