diff options
Diffstat (limited to 'vcl/unx/generic/dtrans')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.cxx | 32 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.hxx | 7 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_dndcontext.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_droptarget.cxx | 23 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 117 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 11 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_service.cxx | 9 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_transferable.cxx | 11 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/bmp.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/config.cxx | 3 |
10 files changed, 0 insertions, 216 deletions
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 2e2cc9071eb8..4e6b953e1728 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <X11/Xatom.h> #include <X11_clipboard.hxx> #include <X11_transferable.hxx> @@ -45,7 +44,6 @@ using namespace cppu; using namespace osl; using namespace x11; - X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : ::cppu::WeakComponentImplHelper2< ::com::sun::star::datatransfer::clipboard::XSystemClipboard, @@ -71,8 +69,6 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : } } - - X11Clipboard::~X11Clipboard() { MutexGuard aGuard( *Mutex::getGlobalMutex() ); @@ -89,9 +85,6 @@ X11Clipboard::~X11Clipboard() } } - - - void X11Clipboard::fireChangedContentsEvent() { ClearableMutexGuard aGuard( m_rSelectionManager.getMutex() ); @@ -111,8 +104,6 @@ void X11Clipboard::fireChangedContentsEvent() } } - - void X11Clipboard::clearContents() { ClearableMutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -134,8 +125,6 @@ void X11Clipboard::clearContents() xOwner->lostOwnership(xThis, m_aContents); } - - Reference< XTransferable > SAL_CALL X11Clipboard::getContents() throw(RuntimeException, std::exception) { @@ -146,8 +135,6 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents() return m_aContents; } - - void SAL_CALL X11Clipboard::setContents( const Reference< XTransferable >& xTrans, const Reference< XClipboardOwner >& xClipboardOwner ) @@ -181,24 +168,18 @@ void SAL_CALL X11Clipboard::setContents( fireChangedContentsEvent(); } - - OUString SAL_CALL X11Clipboard::getName() throw(RuntimeException, std::exception) { return m_rSelectionManager.getString( m_aSelection ); } - - sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities() throw(RuntimeException, std::exception) { return RenderingCapabilities::Delayed; } - - void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) throw(RuntimeException, std::exception) { @@ -206,8 +187,6 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis m_aListeners.push_back( listener ); } - - void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) throw(RuntimeException, std::exception) { @@ -215,37 +194,26 @@ void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboard m_aListeners.remove( listener ); } - - - Reference< XTransferable > X11Clipboard::getTransferable() { return getContents(); } - - void X11Clipboard::clearTransferable() { clearContents(); } - - void X11Clipboard::fireContentsChanged() { fireChangedContentsEvent(); } - - Reference< XInterface > X11Clipboard::getReference() throw() { return Reference< XInterface >( static_cast< OWeakObject* >(this) ); } - - OUString SAL_CALL X11Clipboard::getImplementationName( ) throw(RuntimeException, std::exception) { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index f2758222c9f2..5852321dbb24 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> #include <cppuhelper/compbase2.hxx> - - #define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport" namespace x11 { @@ -50,7 +48,6 @@ namespace x11 { protected: - friend class SelectionManager; void fireChangedContentsEvent(); @@ -118,14 +115,10 @@ namespace x11 { virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE; }; - - Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); - - } // namepspace #endif diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 5b77bd7e2824..19df17212532 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <X11_dndcontext.hxx> #include <X11_selection.hxx> @@ -58,7 +57,6 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exceptio m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp ); } - /* * DropTargetDragContext */ diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index d90e8a58ad84..51bd3c0a352a 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::awt; using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; - DropTarget::DropTarget() : ::cppu::WeakComponentImplHelper3< XDropTarget, @@ -46,8 +45,6 @@ DropTarget::~DropTarget() m_pSelectionManager->deregisterDropTarget( m_aTargetWindow ); } - - void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { if( arguments.getLength() > 1 ) @@ -76,8 +73,6 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su } } - - void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -85,8 +80,6 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& m_aListeners.push_back( xListener ); } - - void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -94,15 +87,11 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener m_aListeners.remove( xListener ); } - - sal_Bool DropTarget::isActive() throw(std::exception) { return m_bActive; } - - void DropTarget::setActive( sal_Bool active ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -110,15 +99,11 @@ void DropTarget::setActive( sal_Bool active ) throw(std::exception) m_bActive = active; } - - sal_Int8 DropTarget::getDefaultActions() throw(std::exception) { return m_nDefaultActions; } - - void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -126,8 +111,6 @@ void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) m_nDefaultActions = actions; } - - void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -140,8 +123,6 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() } } - - void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -154,8 +135,6 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() } } - - void DropTarget::dragExit( const DropTargetEvent& dte ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -168,8 +147,6 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw() } } - - void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 396f49619a90..9922696d8b7b 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -87,7 +87,6 @@ using namespace cppu; using namespace x11; - // stubs to satisfy solaris compiler's rather rigid linking warning extern "C" { @@ -102,7 +101,6 @@ extern "C" } } - static const long nXdndProtocolRevision = 5; // mapping between mime types (or what the office thinks of mime types) @@ -202,16 +200,12 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) return aEncoding; } - - ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() { static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; return aInstances; } - - SelectionManager::SelectionManager() : m_nIncrementalThreshold( 15*1024 ), m_pDisplay( NULL ), @@ -436,9 +430,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c nodrop_curs_x_hot, nodrop_curs_y_hot ); - - - // just interested in SelectionClear/Notify/Request and PropertyChange XSelectInput( m_pDisplay, m_aWindow, PropertyChangeMask ); // create the transferable for Drag operations @@ -464,8 +455,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c } } - - SelectionManager::~SelectionManager() { #if OSL_DEBUG_LEVEL > 1 @@ -529,8 +518,6 @@ SelectionManager::~SelectionManager() } } - - SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) { ::boost::unordered_map< Atom, Selection* >::iterator it = @@ -538,8 +525,6 @@ SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL; } - - OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) { osl::MutexGuard aGuard( m_aMutex ); @@ -569,8 +554,6 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) return aRet; } - - OString SelectionManager::convertToCompound( const OUString& rText ) { osl::MutexGuard aGuard( m_aMutex ); @@ -609,8 +592,6 @@ OString SelectionManager::convertToCompound( const OUString& rText ) return aRet; } - - bool SelectionManager::convertData( const css::uno::Reference< XTransferable >& xTransferable, Atom nType, @@ -689,8 +670,6 @@ bool SelectionManager::convertData( return bSuccess; } - - SelectionManager& SelectionManager::get( const OUString& rDisplayName ) { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); @@ -708,8 +687,6 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) return *pInstance; } - - const OUString& SelectionManager::getString( Atom aAtom ) { osl::MutexGuard aGuard(m_aMutex); @@ -729,8 +706,6 @@ const OUString& SelectionManager::getString( Atom aAtom ) return m_aAtomToString[ aAtom ]; } - - Atom SelectionManager::getAtom( const OUString& rString ) { osl::MutexGuard aGuard(m_aMutex); @@ -746,8 +721,6 @@ Atom SelectionManager::getAtom( const OUString& rString ) return m_aStringToAtom[ rString ]; } - - bool SelectionManager::requestOwnership( Atom selection ) { bool bSuccess = false; @@ -790,8 +763,6 @@ bool SelectionManager::requestOwnership( Atom selection ) return bSuccess; } - - void SelectionManager::convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront ) { NativeTypeEntry* pTab = selection == m_nXdndSelection ? aXdndConversionTab : aNativeConversionTab; @@ -833,8 +804,6 @@ void SelectionManager::convertTypeToNative( const OUString& rType, Atom selectio rConversions.push_back( getAtom( rType ) ); }; - - void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection ) { rOutTypeList.clear(); @@ -864,8 +833,6 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, rOutTypeList.push_back( m_nMULTIPLEAtom ); } - - OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, int& rFormat ) { NativeTypeEntry* pTab = (selection == m_nXdndSelection) ? aXdndConversionTab : aNativeConversionTab; @@ -885,8 +852,6 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in return getString( nType ); } - - bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { osl::ResettableMutexGuard aGuard(m_aMutex); @@ -1023,8 +988,6 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In return bSuccess; } - - bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ) { bool bSuccess = false; @@ -1238,8 +1201,6 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ return bSuccess; } - - bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes ) { ::boost::unordered_map< Atom, Selection* >::iterator it; @@ -1443,8 +1404,6 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > return bSuccess; } - - PixmapHolder* SelectionManager::getPixmapHolder( Atom selection ) { boost::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); @@ -1603,8 +1562,6 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, return bConverted; } - - bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -1812,8 +1769,6 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest return true; } - - bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1931,8 +1886,6 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -2031,8 +1984,6 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -2124,8 +2075,6 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) { osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2374,8 +2323,6 @@ void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLI * methods for XDropTargetDragContext */ - - void SelectionManager::sendDragStatus( Atom nDropAction ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2443,15 +2390,11 @@ void SelectionManager::sendDragStatus( Atom nDropAction ) } } - - sal_Int8 SelectionManager::getUserDragAction() const { return (m_nTargetAcceptAction != DNDConstants::ACTION_DEFAULT) ? m_nTargetAcceptAction : m_nUserDragAction; } - - bool SelectionManager::updateDragAction( int modifierState ) { bool bRet = false; @@ -2503,8 +2446,6 @@ bool SelectionManager::updateDragAction( int modifierState ) return bRet; } - - void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2563,8 +2504,6 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) } } - - bool SelectionManager::handleDragEvent( XEvent& rMessage ) { if( ! m_xDragSourceListener.is() ) @@ -2884,8 +2823,6 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) return bHandled; } - - void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) @@ -2906,8 +2843,6 @@ void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, } } - - void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) @@ -2940,8 +2875,6 @@ sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) return false; } - - sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { XLIB_Cursor aCursor = m_aNoneCursor; @@ -2954,8 +2887,6 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::e return aCursor; } - - int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) { Atom* pProperties = NULL; @@ -3025,8 +2956,6 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) return nVersion; } - - void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -3071,7 +3000,6 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) } } - DragSourceDragEvent dsde; dsde.Source = static_cast< OWeakObject* >(this); dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); @@ -3184,8 +3112,6 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) } } - - void SelectionManager::startDrag( const DragGestureEvent& trigger, sal_Int8 sourceActions, @@ -3280,7 +3206,6 @@ void SelectionManager::startDrag( aParent = aChild; } while( aChild != None ); - #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "try to grab pointer ... " ); #endif @@ -3534,8 +3459,6 @@ sal_Int32 SelectionManager::getCurrentCursor() return m_aCurrentCursor; } - - void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time ) { osl::MutexGuard aGuard( m_aMutex ); @@ -3550,14 +3473,10 @@ void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLI } } - - void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time ) { } - - void SelectionManager::transferablesFlavorsChanged() { osl::MutexGuard aGuard(m_aMutex); @@ -3609,8 +3528,6 @@ void SelectionManager::transferablesFlavorsChanged() * dispatch loop */ - - bool SelectionManager::handleXEvent( XEvent& rEvent ) { /* @@ -3695,8 +3612,6 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) return bHandled; } - - void SelectionManager::dispatchEvent( int millisec ) { // acquire the mutex to prevent other threads @@ -3737,8 +3652,6 @@ void SelectionManager::dispatchEvent( int millisec ) } } - - void SelectionManager::run( void* pThis ) { #if OSL_DEBUG_LEVEL > 1 @@ -3862,8 +3775,6 @@ void SelectionManager::shutdown() throw() m_xDropTransferable.clear(); } - - sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception) { Sequence< sal_Int8 > aSeq; @@ -3922,8 +3833,6 @@ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang: disposing(rEvent); } - - void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor ) { osl::MutexGuard aGuard(m_aMutex); @@ -3934,8 +3843,6 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt m_aSelections[ selection ] = pNewSelection; } - - void SelectionManager::deregisterHandler( Atom selection ) { osl::MutexGuard aGuard(m_aMutex); @@ -3950,8 +3857,6 @@ void SelectionManager::deregisterHandler( Atom selection ) } } - - static bool bWasError = false; extern "C" @@ -4006,8 +3911,6 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar OSL_FAIL( "attempt to register None as drop target" ); } - - void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -4062,28 +3965,20 @@ css::uno::Reference< XTransferable > SelectionManager::getTransferable() throw() return m_xDragSourceTransferable; } - - void SelectionManager::clearTransferable() throw() { m_xDragSourceTransferable.clear(); } - - void SelectionManager::fireContentsChanged() throw() { } - - css::uno::Reference< XInterface > SelectionManager::getReference() throw() { return css::uno::Reference< XInterface >( static_cast<OWeakObject*>(this) ); } - - /* * SelectionManagerHolder */ @@ -4096,14 +3991,10 @@ SelectionManagerHolder::SelectionManagerHolder() : { } - - SelectionManagerHolder::~SelectionManagerHolder() { } - - void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { OUString aDisplayName; @@ -4133,15 +4024,11 @@ sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : false; } - - sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0; } - - void SelectionManagerHolder::startDrag( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, @@ -4153,14 +4040,10 @@ void SelectionManagerHolder::startDrag( m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener ); } - - /* * XServiceInfo */ - - OUString SelectionManagerHolder::getImplementationName() throw(std::exception) { return OUString(XDND_IMPLEMENTATION_NAME); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 4f0aa4e429c7..2bfc632f8113 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -49,7 +49,6 @@ namespace x11 { class PixmapHolder; // in bmp.hxx - rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor @@ -146,7 +145,6 @@ namespace x11 { }; - class SelectionManager : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::dnd::XDragSource, @@ -259,7 +257,6 @@ namespace x11 { sal_Int32 m_nSelectionTimeout; XLIB_Time m_nSelectionTimestamp; - // members used for Xdnd // drop only @@ -324,14 +321,12 @@ namespace x11 { XLIB_Cursor m_aNoneCursor; XLIB_Cursor m_aCurrentCursor; - // drag and drop int m_nCurrentProtocolVersion; ::boost::unordered_map< XLIB_Window, DropTargetEntry > m_aDropTargets; - // some special atoms that are needed often Atom m_nCLIPBOARDAtom; Atom m_nTARGETSAtom; @@ -435,7 +430,6 @@ namespace x11 { Display * getDisplay() { return m_pDisplay; }; XLIB_Window getWindow() { return m_aWindow; }; - void registerHandler( Atom selection, SelectionAdaptor& rAdaptor ); void deregisterHandler( Atom selection ); bool requestOwnership( Atom selection ); @@ -443,7 +437,6 @@ namespace x11 { // allow for synchronization over one mutex for XClipboard osl::Mutex& getMutex() { return m_aMutex; } - Atom getAtom( const OUString& rString ); const OUString& getString( Atom nAtom ); @@ -507,8 +500,6 @@ namespace x11 { throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; - - ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); @@ -517,8 +508,6 @@ namespace x11 { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); - - } #endif diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 0ed55666cd97..36b1b9cbf2d4 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unx/salinst.h" #include <X11_clipboard.hxx> @@ -35,7 +34,6 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::awt; using namespace x11; - Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); @@ -57,8 +55,6 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() return aRet; } - - css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { SelectionManager& rManager = SelectionManager::get(); @@ -86,19 +82,14 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc return static_cast<OWeakObject*>(pClipboard); } - - css::uno::Reference< XInterface > X11SalInstance::CreateDragSource() { return css::uno::Reference < XInterface >( ( OWeakObject * ) new SelectionManagerHolder() ); } - - css::uno::Reference< XInterface > X11SalInstance::CreateDropTarget() { return css::uno::Reference < XInterface >( ( OWeakObject * ) new DropTarget() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index e913e8d83821..29493126884f 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -35,8 +34,6 @@ using namespace osl; using namespace x11; - - X11Transferable::X11Transferable( SelectionManager& rManager, Atom selection @@ -46,14 +43,10 @@ X11Transferable::X11Transferable( { } - - X11Transferable::~X11Transferable() { } - - Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) { @@ -85,8 +78,6 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) return aRet; } - - Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() throw(RuntimeException, std::exception) { @@ -98,8 +89,6 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() return aFlavorList; } - - sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException, std::exception) { diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index a6a7f43370e3..0e8a2e52426d 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unistd.h> #include <cstdio> #include <cstring> diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index d4a4633f0976..92f672b3359c 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdio> #include <unotools/configitem.hxx> @@ -48,7 +47,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace x11; - sal_Int32 SelectionManager::getSelectionTimeout() { if( m_nSelectionTimeout < 1 ) @@ -128,5 +126,4 @@ void DtransX11ConfigItem::Notify( const Sequence< OUString >& /*rPropertyNames*/ { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |