diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:22:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 10:20:05 -0600 |
commit | 75bbbf964b7976cc02d5ba054760bf93cb2e76c9 (patch) | |
tree | a20660b861414f454d9ae8ff7b554bc1667e3bdb /dtrans/source/win32/dnd | |
parent | 5faf5492741abfd013ae677b1ec2fc06276d8644 (diff) |
Remove visual noise from dtrans
Change-Id: Ic460e514ac078a69cd86381b9b5cf779eb97971b
Reviewed-on: https://gerrit.libreoffice.org/8254
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dtrans/source/win32/dnd')
-rw-r--r-- | dtrans/source/win32/dnd/dndentry.cxx | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/globals.cxx | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/globals.hxx | 4 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/idroptarget.cxx | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/idroptarget.hxx | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/source.hxx | 5 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/sourcecontext.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/sourcecontext.hxx | 6 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/target.cxx | 3 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/target.hxx | 11 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/targetdragcontext.hxx | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/targetdropcontext.hxx | 1 |
12 files changed, 0 insertions, 37 deletions
diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index 8aadbed956c6..da2e8de24bdd 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -43,7 +43,6 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic return Reference<XInterface>( static_cast<XInitialization*>(pTarget), UNO_QUERY); } - extern "C" { diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx index 329551fabe0e..f36297e349b1 100644 --- a/dtrans/source/win32/dnd/globals.cxx +++ b/dtrans/source/win32/dnd/globals.cxx @@ -82,7 +82,6 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) return ret; } - sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect) { sal_Int8 ret= ACTION_NONE; diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx index 1828fc1549ee..e614e50962b6 100644 --- a/dtrans/source/win32/dnd/globals.hxx +++ b/dtrans/source/win32/dnd/globals.hxx @@ -30,7 +30,6 @@ #endif #include <sal/types.h> - #define DNDSOURCE_SERVICE_NAME "com.sun.star.datatransfer.dnd.OleDragSource" #define DNDSOURCE_IMPL_NAME "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1" @@ -71,14 +70,11 @@ DWORD dndActionsToDropEffects( sal_Int8 actions); // or Alt). DWORD dndActionsToSingleDropEffect( sal_Int8 actions); - - struct MutexDummy { osl::Mutex m_mutex; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx index b0e4ad970c55..1510a5420965 100644 --- a/dtrans/source/win32/dnd/idroptarget.cxx +++ b/dtrans/source/win32/dnd/idroptarget.cxx @@ -35,7 +35,6 @@ IDropTargetImpl::~IDropTargetImpl() { } - //IDropTarget HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void **ppvObject) { diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx index 32425a627304..bbaa799b147b 100644 --- a/dtrans/source/win32/dnd/idroptarget.hxx +++ b/dtrans/source/win32/dnd/idroptarget.hxx @@ -61,7 +61,6 @@ public: /* [in] */ POINTL pt, /* [out][in] */ DWORD __RPC_FAR *pdwEffect); - }; #endif diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index aed4af9b9126..333fc7b61106 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -93,7 +93,6 @@ public: virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); - // XDragSource virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(RuntimeException); virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) @@ -111,8 +110,6 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); - - virtual HRESULT STDMETHODCALLTYPE QueryInterface( /* [in] */ REFIID riid, /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); @@ -121,7 +118,6 @@ public: virtual ULONG STDMETHODCALLTYPE Release( ); - // IDropSource virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag( /* [in] */ BOOL fEscapePressed, @@ -132,7 +128,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx index a9f1c090dac1..a6f106f5e99a 100644 --- a/dtrans/source/win32/dnd/sourcecontext.cxx +++ b/dtrans/source/win32/dnd/sourcecontext.cxx @@ -73,7 +73,6 @@ void SAL_CALL SourceContext::transferablesFlavorsChanged( ) { } - // non -interface functions // Fires XDragSourceListener::dragDropEnd events. void SourceContext::fire_dragDropEnd( sal_Bool success, sal_Int8 effect) @@ -110,7 +109,6 @@ void SourceContext::fire_dragDropEnd( sal_Bool success, sal_Int8 effect) } } - void SourceContext::fire_dropActionChanged( sal_Int8 dropAction, sal_Int8 userAction) { if( m_currentAction != dropAction) diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx index 4d9e5c928dc9..f149abb5e556 100644 --- a/dtrans/source/win32/dnd/sourcecontext.hxx +++ b/dtrans/source/win32/dnd/sourcecontext.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp> #include <cppuhelper/compbase1.hxx> - #include "source.hxx" using namespace ::com::sun::star::datatransfer; @@ -32,7 +31,6 @@ using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - // This class fires events to XDragSourceListener implementations. // Of that interface only dragDropEnd and dropActionChanged are called. // The functions dragEnter, dragExit and dragOver are not supported @@ -68,16 +66,12 @@ public: virtual void SAL_CALL transferablesFlavorsChanged( ) throw( RuntimeException); - - // non - interface functions void fire_dragDropEnd( sal_Bool success, sal_Int8 byte); void fire_dropActionChanged( sal_Int8 dropAction, sal_Int8 userAction); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 036ae9686124..4f52e540d07c 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; - #define WM_REGISTERDRAGDROP WM_USER + 1 #define WM_REVOKEDRAGDROP WM_USER + 2 extern Reference< XTransferable > g_XTransferable; @@ -135,7 +134,6 @@ void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments ) m_pDropTarget= new IDropTargetImpl( *static_cast<DropTarget*>( this) ); m_pDropTarget->AddRef(); - // Obtain the id of the thread that created the window m_threadIdWindow= GetWindowThreadProcessId( m_hWnd, NULL); // The event is set by the thread that we will create momentarily. @@ -274,7 +272,6 @@ sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException) return m_bActive; //m_bDropTargetRegistered; } - void SAL_CALL DropTarget::setActive( sal_Bool _b ) throw(RuntimeException) { MutexGuard g(m_mutex); diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index 98ccb2d14de4..37772ac1f4e1 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -38,7 +38,6 @@ #include "globals.hxx" #include "../../inc/DtObjFactory.hxx" - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace cppu; @@ -106,7 +105,6 @@ private: Reference<XDropTargetDragContext> m_currentDragContext; Reference<XDropTargetDropContext> m_currentDropContext; - private: DropTarget(); DropTarget(DropTarget&); @@ -140,7 +138,6 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); - // Functions called from the IDropTarget implementation ( m_pDropTarget) virtual HRESULT DragEnter( /* [unique][in] */ IDataObject *pDataObj, @@ -161,7 +158,6 @@ public: /* [in] */ POINTL pt, /* [out][in] */ DWORD *pdwEffect); - // Non - interface functions -------------------------------------------------- // XDropTargetDropContext delegated from DropContext @@ -173,7 +169,6 @@ public: void _acceptDrag( sal_Int8 dragOperation, const Reference<XDropTargetDragContext>& context); void _rejectDrag( const Reference<XDropTargetDragContext>& context); - protected: // Gets the current action dependend on the pressed modifiers, the effects // supported by the drop source (IDropSource) and the default actions of the @@ -182,20 +177,14 @@ protected: // Only filters with the default actions inline sal_Int8 getFilteredActions( DWORD grfKeyState); - - void fire_drop( const DropTargetDropEvent& dte); void fire_dragEnter( const DropTargetDragEnterEvent& dtde ); void fire_dragExit( const DropTargetEvent& dte ); void fire_dragOver( const DropTargetDragEvent& dtde ); void fire_dropActionChanged( const DropTargetDragEvent& dtde ); - - - }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx index 28b0b8233d91..26029c86681b 100644 --- a/dtrans/source/win32/dnd/targetdragcontext.hxx +++ b/dtrans/source/win32/dnd/targetdragcontext.hxx @@ -20,7 +20,6 @@ #ifndef _TARGETDRAGCONTEXT_HXX_ #define _TARGETDRAGCONTEXT_HXX_ - #include <cppuhelper/implbase1.hxx> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx index ce6e4c5c58cb..6f428c89b080 100644 --- a/dtrans/source/win32/dnd/targetdropcontext.hxx +++ b/dtrans/source/win32/dnd/targetdropcontext.hxx @@ -43,7 +43,6 @@ public: TargetDropContext( DropTarget* pTarget); ~TargetDropContext(); - // XDropTargetDragContext virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw( RuntimeException); |