diff options
Diffstat (limited to 'dtrans/source/win32/dnd')
| -rw-r--r-- | dtrans/source/win32/dnd/dnd.xml | 70 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/dndentry.cxx | 34 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/globals.cxx | 12 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/globals.hxx | 22 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/idroptarget.cxx | 18 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/idroptarget.hxx | 24 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/source.cxx | 8 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/source.hxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/sourcecontext.cxx | 2 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/sourcecontext.hxx | 14 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/target.cxx | 6 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/target.hxx | 6 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/targetdragcontext.cxx | 4 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/targetdragcontext.hxx | 6 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/targetdropcontext.cxx | 10 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/targetdropcontext.hxx | 16 |
16 files changed, 127 insertions, 127 deletions
diff --git a/dtrans/source/win32/dnd/dnd.xml b/dtrans/source/win32/dnd/dnd.xml index 10db2ddb2326..a7690cbd2de4 100644 --- a/dtrans/source/win32/dnd/dnd.xml +++ b/dtrans/source/win32/dnd/dnd.xml @@ -1,46 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> dnd </module-name> + <module-name> dnd </module-name> <component-description> <author> Joachim Lingner </author> - <name> com.sun.star.comp.datatransfer.dnd.OleDragAndDrop </name> + <name> com.sun.star.comp.datatransfer.dnd.OleDragAndDrop </name> <description> The win32 implementation of the drop target service. </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> <status value="beta"/> - <supported-service> com.sun.star.datatransfer.dnd.OleDragSource</supported-service> - <supported-service> com.sun.star.datatransfer.dnd.OleDropTarget</supported-service> - <service-dependency> ... </service-dependency> - <type> com.sun.star.datatransfer.dnd.DNDConstants </type> - <type> com.sun.star.datatransfer.dnd.XDropTarget </type> - <type> com.sun.star.datatransfer.dnd.XDropTargetDragContext </type> - <type> com.sun.star.datatransfer.dnd.XDropTargetListener </type> - <type> com.sun.star.datatransfer.dnd.XDropTargetDropContext </type> - <type> com.sun.star.datatransfer.dnd.XDragSourceContext </type> - <type> com.sun.star.datatransfer.dnd.XDragSource </type> - <type> com.sun.star.datatransfer.XTransferable </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.XInitialization </type> - <type> com.sun.star.lang.XUnoTunnel </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.awt.MouseButton </type> - <type> com.sun.star.awt.MouseEvent </type> + <supported-service> com.sun.star.datatransfer.dnd.OleDragSource</supported-service> + <supported-service> com.sun.star.datatransfer.dnd.OleDropTarget</supported-service> + <service-dependency> ... </service-dependency> + <type> com.sun.star.datatransfer.dnd.DNDConstants </type> + <type> com.sun.star.datatransfer.dnd.XDropTarget </type> + <type> com.sun.star.datatransfer.dnd.XDropTargetDragContext </type> + <type> com.sun.star.datatransfer.dnd.XDropTargetListener </type> + <type> com.sun.star.datatransfer.dnd.XDropTargetDropContext </type> + <type> com.sun.star.datatransfer.dnd.XDragSourceContext </type> + <type> com.sun.star.datatransfer.dnd.XDragSource </type> + <type> com.sun.star.datatransfer.XTransferable </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.XInitialization </type> + <type> com.sun.star.lang.XUnoTunnel </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.awt.MouseButton </type> + <type> com.sun.star.awt.MouseEvent </type> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index 34bc550d46c3..cfb0b8d3d5a5 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ #include "source.hxx" #include "target.hxx" -using namespace ::rtl ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::registry ; -using namespace ::cppu ; +using namespace ::rtl ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::registry ; +using namespace ::cppu ; using namespace ::com::sun::star::lang; rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; @@ -56,7 +56,7 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic } -extern "C" +extern "C" { sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) { @@ -88,17 +88,17 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr { try { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); + Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_REGKEY_NAME ) ) ); bRetVal = sal_True; - pXNewKey= static_cast< XRegistryKey* >( pRegistryKey ); + pXNewKey= static_cast< XRegistryKey* >( pRegistryKey ); pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_REGKEY_NAME ) ) ); bRetVal = sal_True; } catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); + { + OSL_ENSURE(sal_False, "InvalidRegistryException caught"); bRetVal = sal_False; } } @@ -107,7 +107,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr } //---------------------------------------------------------------------- -// component_getFactory +// component_getFactory // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- @@ -119,21 +119,21 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDSOURCE_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_SERVICE_NAME ) ); - + aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_SERVICE_NAME ) ); + xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), OUString::createFromAscii( pImplName ), createDragSource, aSNS, &g_moduleCount.modCnt); - + } else if( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDTARGET_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_SERVICE_NAME ) ); - + aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_SERVICE_NAME ) ); + xFactory= createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), OUString::createFromAscii( pImplName ), @@ -146,7 +146,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p { xFactory->acquire(); pRet = xFactory.get(); - } + } return pRet; } diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx index f8160de03639..fa5f301ea90d 100644 --- a/dtrans/source/win32/dnd/globals.cxx +++ b/dtrans/source/win32/dnd/globals.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) // no MK_ALT, MK_CONTROL, MK_SHIFT if( !(grfKeyState & MK_CONTROL) && - !(grfKeyState & MK_ALT) && + !(grfKeyState & MK_ALT) && !(grfKeyState & MK_RBUTTON) && !(grfKeyState & MK_SHIFT)) { @@ -56,7 +56,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) { ret= ACTION_DEFAULT | ACTION_MOVE; } - + else if( nSourceActions & ACTION_COPY ) { ret= ACTION_COPY; @@ -75,8 +75,8 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) { ret= ACTION_MOVE; } - else if ( grfKeyState & MK_CONTROL && - !(grfKeyState & MK_SHIFT) ) + else if ( grfKeyState & MK_CONTROL && + !(grfKeyState & MK_SHIFT) ) { ret= ACTION_COPY; } @@ -85,7 +85,7 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) { ret= ACTION_LINK; } - else if ( grfKeyState & MK_RBUTTON | + else if ( grfKeyState & MK_RBUTTON | grfKeyState & MK_ALT) { ret= ACTION_COPY_OR_MOVE | ACTION_LINK; diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx index d9ff77dd731d..e3803de1cbe9 100644 --- a/dtrans/source/win32/dnd/globals.hxx +++ b/dtrans/source/win32/dnd/globals.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,34 +49,34 @@ #define DNDTARGET_REGKEY_NAME "/com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1/UNO/SERVICES/com.sun.star.datatransfer.dnd.OleDropTarget" // This maps key states as occur as parameter, e.g. in IDropTarget::DragEnter, -// IDropSource::QueryContinueDrag, to actions as are declared in +// IDropSource::QueryContinueDrag, to actions as are declared in // com::sun::star::datatransfer::dnd::DNDConstants ( ACTION_MOVE etc). -// If the grfKeyState indicates the ALt or right mousebutton then the returned +// If the grfKeyState indicates the ALt or right mousebutton then the returned // values combines all possible actions. This is because those key and button are // used when the user expect a menu to appear when he drops. The menu then // contains entries, such as move, copy, link, cancel. -// An odd fact is that the argument grfKeyState in IDropTarget::Drop does not -// contain mouse buttons (winnt 4 SP6). That indicates that the right mouse button +// An odd fact is that the argument grfKeyState in IDropTarget::Drop does not +// contain mouse buttons (winnt 4 SP6). That indicates that the right mouse button // is not considered relevant in a drag operation. Contrarily the file explorer -// gives that button a special meaning: the user has to select the effect from +// gives that button a special meaning: the user has to select the effect from // a context menu on drop. sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 sourceActions); -// The function maps a windows DROPEFFECTs to actions +// The function maps a windows DROPEFFECTs to actions // ( com::sun::star::datatransfer::dnd::DNDConstants). -// The argument can be a combination of different DROPEFFECTS, -// In that case the return value is also a combination of the +// The argument can be a combination of different DROPEFFECTS, +// In that case the return value is also a combination of the // appropriate actions. sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect); // The function maps actions ( com::sun::star::datatransfer::dnd::DNDConstants) // to window DROPEFFECTs. // The argument can be a combination of different actions -// In that case the return value is also a combination of the +// In that case the return value is also a combination of the // appropriate DROPEFFECTS. DWORD dndActionsToDropEffects( sal_Int8 actions); -// If the argument constitutes only one action then it is mapped to the +// If the argument constitutes only one action then it is mapped to the // corresponding DROPEFFECT otherwise DROPEFFECT_MOVE is returned. This is // why move is the default effect (no modifiers pressed, or right mouse button // or Alt). diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx index 5fa45b935391..e1324bcf6d89 100644 --- a/dtrans/source/win32/dnd/idroptarget.cxx +++ b/dtrans/source/win32/dnd/idroptarget.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void ** *ppvObject= static_cast<IUnknown*>( this); else if ( riid == __uuidof( IDropTarget)) *ppvObject= static_cast<IDropTarget*>( this); - + if(*ppvObject) { AddRef(); @@ -68,14 +68,14 @@ HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void ** } else return E_NOINTERFACE; - + } - + ULONG STDMETHODCALLTYPE IDropTargetImpl::AddRef( void) { return InterlockedIncrement( &m_nRefCount); } - + ULONG STDMETHODCALLTYPE IDropTargetImpl::Release( void) { LONG count= InterlockedDecrement( &m_nRefCount); @@ -92,25 +92,25 @@ STDMETHODIMP IDropTargetImpl::DragEnter( IDataObject __RPC_FAR *pDataObj, return m_rDropTarget.DragEnter( pDataObj, grfKeyState, pt, pdwEffect); } - + STDMETHODIMP IDropTargetImpl::DragOver( DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { return m_rDropTarget.DragOver( grfKeyState, pt, pdwEffect); } - + STDMETHODIMP IDropTargetImpl::DragLeave( void) { return m_rDropTarget.DragLeave(); } - + STDMETHODIMP IDropTargetImpl::Drop( IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) { - return m_rDropTarget.Drop( pDataObj, grfKeyState, + return m_rDropTarget.Drop( pDataObj, grfKeyState, pt, pdwEffect); } diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx index 8fafd98f01db..2f958ca7d0ae 100644 --- a/dtrans/source/win32/dnd/idroptarget.hxx +++ b/dtrans/source/win32/dnd/idroptarget.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _IDROPTARGET_HXX_ -#define _IDROPTARGET_HXX_ +#define _IDROPTARGET_HXX_ #include "target.hxx" @@ -36,35 +36,35 @@ class IDropTargetImpl: public IDropTarget // Calls to IDropTarget functions are delegated to a DropTarget. DropTarget& m_rDropTarget; - virtual ~IDropTargetImpl(); // delete is only called by IUnknown::Release + virtual ~IDropTargetImpl(); // delete is only called by IUnknown::Release IDropTargetImpl( const IDropTargetImpl& ); IDropTargetImpl& operator=( const IDropTargetImpl& ); public: IDropTargetImpl( DropTarget& pTarget); // IDropTarget - virtual HRESULT STDMETHODCALLTYPE QueryInterface( + virtual HRESULT STDMETHODCALLTYPE QueryInterface( /* [in] */ REFIID riid, /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - + virtual ULONG STDMETHODCALLTYPE AddRef( ); - + virtual ULONG STDMETHODCALLTYPE Release( ); - virtual HRESULT STDMETHODCALLTYPE DragEnter( + virtual HRESULT STDMETHODCALLTYPE DragEnter( /* [unique][in] */ IDataObject __RPC_FAR *pDataObj, /* [in] */ DWORD grfKeyState, /* [in] */ POINTL pt, /* [out][in] */ DWORD __RPC_FAR *pdwEffect); - - virtual HRESULT STDMETHODCALLTYPE DragOver( + + virtual HRESULT STDMETHODCALLTYPE DragOver( /* [in] */ DWORD grfKeyState, /* [in] */ POINTL pt, /* [out][in] */ DWORD __RPC_FAR *pdwEffect); - + virtual HRESULT STDMETHODCALLTYPE DragLeave( ) ; - - virtual HRESULT STDMETHODCALLTYPE Drop( + + virtual HRESULT STDMETHODCALLTYPE Drop( /* [unique][in] */ IDataObject __RPC_FAR *pDataObj, /* [in] */ DWORD grfKeyState, /* [in] */ POINTL pt, diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 7d714aed4a33..d411671cf45e 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ unsigned __stdcall DndOleSTAFunc(LPVOID pParams); DragSource::DragSource( const Reference<XMultiServiceFactory>& sf): m_serviceFactory( sf), WeakComponentImplHelper3< XDragSource, XInitialization, XServiceInfo >(m_mutex), -// m_pcurrentContext_impl(0), +// m_pcurrentContext_impl(0), m_hAppWindow(0), m_MouseButton(0), m_RunningDndOperationCount(0) @@ -219,7 +219,7 @@ void SAL_CALL DragSource::startDrag( DragSourceDropEvent dsde; - dsde.DropAction = ACTION_NONE; + dsde.DropAction = ACTION_NONE; dsde.DropSuccess = false; try @@ -297,7 +297,7 @@ HRESULT STDMETHODCALLTYPE DragSource::QueryContinueDrag( { if( ( m_MouseButton == MouseButton::RIGHT && !(grfKeyState & MK_RBUTTON) ) || ( m_MouseButton == MouseButton::MIDDLE && !(grfKeyState & MK_MBUTTON) ) || - ( m_MouseButton == MouseButton::LEFT && !(grfKeyState & MK_LBUTTON) ) || + ( m_MouseButton == MouseButton::LEFT && !(grfKeyState & MK_LBUTTON) ) || ( m_MouseButton == 0 && !(grfKeyState & MK_LBUTTON) ) ) { retVal= DRAGDROP_S_DROP; diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index feef33a18add..cb10927ee9cc 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx index d4d59f4d736c..ff100d106b66 100644 --- a/dtrans/source/win32/dnd/sourcecontext.cxx +++ b/dtrans/source/win32/dnd/sourcecontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx index a73159abe258..b1ca8b984beb 100644 --- a/dtrans/source/win32/dnd/sourcecontext.hxx +++ b/dtrans/source/win32/dnd/sourcecontext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,17 +64,17 @@ public: SourceContext( DragSource* pSource, const Reference<XDragSourceListener>& listener); ~SourceContext(); - virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl ) + virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl ) throw( RuntimeException); - virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl ) + virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl ) throw( RuntimeException); - virtual sal_Int32 SAL_CALL getCurrentCursor( ) + virtual sal_Int32 SAL_CALL getCurrentCursor( ) throw( RuntimeException); - virtual void SAL_CALL setCursor( sal_Int32 cursorId ) + virtual void SAL_CALL setCursor( sal_Int32 cursorId ) throw( RuntimeException); - virtual void SAL_CALL setImage( sal_Int32 imageId ) + virtual void SAL_CALL setImage( sal_Int32 imageId ) throw( RuntimeException); - virtual void SAL_CALL transferablesFlavorsChanged( ) + virtual void SAL_CALL transferablesFlavorsChanged( ) throw( RuntimeException); diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 1f67d3cb92e1..bff6778b17ca 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,11 +132,11 @@ void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments ) // to ensure that it is called from the same thread that created the Window // otherwise meesages sent during DND won't reach the windows message queue. // Calling AttachThreadInput first would resolve this problem but would block - // the message queue of the calling thread. So if the current thread + // the message queue of the calling thread. So if the current thread // (even if it's an STA thread) and the thread that created the window are not // identical we need to create a new thread as we do when the calling thread is // an MTA thread. - + if( aArguments.getLength() > 0) { // Get the window handle from aArgument. It is needed for RegisterDragDrop. diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index e85bd89f2fb0..b7144d402f1f 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,7 +97,7 @@ private: // If m_bActive == sal_True then events are fired to XDropTargetListener s, // none otherwise. The default value is sal_True. sal_Bool m_bActive; - sal_Int8 m_nDefaultActions; + sal_Int8 m_nDefaultActions; // This value is set when a XDropTargetListener calls accept or reject on // the XDropTargetDropContext or XDropTargetDragContext. @@ -109,7 +109,7 @@ private: Reference<XTransferable> m_currentData; // The current action is used to determine if the USER // action has changed (dropActionChanged) -// sal_Int8 m_userAction; +// sal_Int8 m_userAction; // Set by listeners when they call XDropTargetDropContext::dropComplete sal_Bool m_bDropComplete; // converts IDataObject objects to XTransferable objects. diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx index 2f0d7fd9510b..19246901ae9e 100644 --- a/dtrans/source/win32/dnd/targetdragcontext.cxx +++ b/dtrans/source/win32/dnd/targetdragcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ TargetDragContext::~TargetDragContext() g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } -void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation ) +void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw( RuntimeException) { m_pDropTarget->_acceptDrag( dragOperation, static_cast<XDropTargetDragContext*>( this) ); diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx index fcb2efe3c920..dead1d94c8e7 100644 --- a/dtrans/source/win32/dnd/targetdragcontext.hxx +++ b/dtrans/source/win32/dnd/targetdragcontext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ class TargetDragContext: public WeakImplHelper1<XDropTargetDragContext> // some calls to the functions of XDropTargetDragContext are delegated // to non-interface functions of m_pDropTarget DropTarget* m_pDropTarget; - + TargetDragContext(); TargetDragContext( const TargetDragContext&); TargetDragContext &operator= ( const TargetDragContext&); @@ -54,7 +54,7 @@ public: TargetDragContext( DropTarget* pTarget); ~TargetDragContext(); - virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) + virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw( RuntimeException); virtual void SAL_CALL rejectDrag( ) throw( RuntimeException); diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx index 87bcddb87498..de8aac4944be 100644 --- a/dtrans/source/win32/dnd/targetdropcontext.cxx +++ b/dtrans/source/win32/dnd/targetdropcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,19 +51,19 @@ TargetDropContext::~TargetDropContext() g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } -void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation ) +void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation ) throw( RuntimeException) { m_pDropTarget->_acceptDrop( dropOperation, static_cast<XDropTargetDropContext*>( this) ); } -void SAL_CALL TargetDropContext::rejectDrop( ) +void SAL_CALL TargetDropContext::rejectDrop( ) throw( RuntimeException) { m_pDropTarget->_rejectDrop( static_cast<XDropTargetDropContext*>( this) ); } - -void SAL_CALL TargetDropContext::dropComplete( sal_Bool success ) + +void SAL_CALL TargetDropContext::dropComplete( sal_Bool success ) throw( RuntimeException) { m_pDropTarget->_dropComplete( success, static_cast<XDropTargetDropContext*>( this) ); diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx index f5cc4670a824..8e41af892f4f 100644 --- a/dtrans/source/win32/dnd/targetdropcontext.hxx +++ b/dtrans/source/win32/dnd/targetdropcontext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,21 +53,21 @@ public: ~TargetDropContext(); - // XDropTargetDragContext - virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) + // XDropTargetDragContext + virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw( RuntimeException); - virtual void SAL_CALL rejectDrop( ) + virtual void SAL_CALL rejectDrop( ) throw( RuntimeException); - -/* virtual Sequence< DataFlavor > SAL_CALL getCurrentDataFlavors( ) + +/* virtual Sequence< DataFlavor > SAL_CALL getCurrentDataFlavors( ) throw( RuntimeException); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& df ) + virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& df ) throw( RuntimeException); */ // XDropTargetDropContext (inherits XDropTargetDragContext) - virtual void SAL_CALL dropComplete( sal_Bool success ) + virtual void SAL_CALL dropComplete( sal_Bool success ) throw( RuntimeException); }; #endif |