Kaydet (Commit) ea407568 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Caolán McNamara

dtrans: com::sun::star->css

Change-Id: I4625a9b73c517b8187e03b11cc0546abdf338d8b
Reviewed-on: https://gerrit.libreoffice.org/18502Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 47283424
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
class CMimeContentTypeFactory : public class CMimeContentTypeFactory : public
cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentTypeFactory, \ cppu::WeakImplHelper< css::datatransfer::XMimeContentTypeFactory,
com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
...@@ -36,19 +36,19 @@ public: ...@@ -36,19 +36,19 @@ public:
// XMimeContentTypeFactory // XMimeContentTypeFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) virtual css::uno::Reference< css::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
......
...@@ -29,28 +29,28 @@ ...@@ -29,28 +29,28 @@
#include <map> #include <map>
class CMimeContentType : public class CMimeContentType : public
cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentType > cppu::WeakImplHelper< css::datatransfer::XMimeContentType >
{ {
public: public:
CMimeContentType( const OUString& aCntType ); CMimeContentType( const OUString& aCntType );
// XMimeContentType // XMimeContentType
virtual OUString SAL_CALL getMediaType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getMediaType( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getMediaSubtype( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getMediaSubtype( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getFullMediaType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getFullMediaType( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getParameters( ) virtual css::uno::Sequence< OUString > SAL_CALL getParameters( )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasParameter( const OUString& aName ) virtual sal_Bool SAL_CALL hasParameter( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getParameterValue( const OUString& aName ) virtual OUString SAL_CALL getParameterValue( const OUString& aName )
throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
void SAL_CALL init( const OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException ); void SAL_CALL init( const OUString& aCntType ) throw( css::lang::IllegalArgumentException );
void SAL_CALL getSym(); void SAL_CALL getSym();
void SAL_CALL acceptSym( const OUString& pSymTlb ); void SAL_CALL acceptSym( const OUString& pSymTlb );
void SAL_CALL skipSpaces(); void SAL_CALL skipSpaces();
......
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
#define CLIPBOARDMANAGER_IMPLEMENTATION_NAME "com.sun.star.comp.datatransfer.ClipboardManager" #define CLIPBOARDMANAGER_IMPLEMENTATION_NAME "com.sun.star.comp.datatransfer.ClipboardManager"
typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > > ClipboardMap; typedef ::std::map< OUString, css::uno::Reference< css::datatransfer::clipboard::XClipboard > > ClipboardMap;
namespace dtrans namespace dtrans
{ {
class ClipboardManager : public ::cppu::WeakComponentImplHelper < class ClipboardManager : public ::cppu::WeakComponentImplHelper <
::com::sun::star::datatransfer::clipboard::XClipboardManager, css::datatransfer::clipboard::XClipboardManager,
::com::sun::star::lang::XEventListener, css::lang::XEventListener,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
ClipboardMap m_aClipboardMap; ClipboardMap m_aClipboardMap;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
...@@ -57,54 +57,54 @@ namespace dtrans ...@@ -57,54 +57,54 @@ namespace dtrans
*/ */
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
/* /*
* XComponent * XComponent
*/ */
virtual void SAL_CALL dispose() virtual void SAL_CALL dispose()
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
/* /*
* XEventListener * XEventListener
*/ */
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
/* /*
* XClipboardManager * XClipboardManager
*/ */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName )
throw(::com::sun::star::container::NoSuchElementException, throw(css::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException); css::uno::RuntimeException);
virtual void SAL_CALL addClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard ) virtual void SAL_CALL addClipboard( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard )
throw(::com::sun::star::lang::IllegalArgumentException, throw(css::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException, css::container::ElementExistException,
::com::sun::star::uno::RuntimeException); css::uno::RuntimeException);
virtual void SAL_CALL removeClipboard( const OUString& aName ) virtual void SAL_CALL removeClipboard( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL listClipboardNames( ) virtual css::uno::Sequence< OUString > SAL_CALL listClipboardNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
}; };
} }
::com::sun::star::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); css::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance( css::uno::Reference< css::uno::XInterface > SAL_CALL ClipboardManager_createInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
#endif #endif
......
...@@ -34,17 +34,17 @@ ...@@ -34,17 +34,17 @@
namespace dtrans namespace dtrans
{ {
class GenericClipboard : public ::cppu::WeakComponentImplHelper < \ class GenericClipboard : public ::cppu::WeakComponentImplHelper <
::com::sun::star::datatransfer::clipboard::XClipboardEx, \ css::datatransfer::clipboard::XClipboardEx,
::com::sun::star::datatransfer::clipboard::XClipboardNotifier, \ css::datatransfer::clipboard::XClipboardNotifier,
::com::sun::star::lang::XServiceInfo, \ css::lang::XServiceInfo,
::com::sun::star::lang::XInitialization > css::lang::XInitialization >
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
OUString m_aName; OUString m_aName;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; css::uno::Reference< css::datatransfer::XTransferable > m_aContents;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner;
sal_Bool m_bInitialized; sal_Bool m_bInitialized;
virtual ~GenericClipboard(); virtual ~GenericClipboard();
...@@ -57,63 +57,63 @@ namespace dtrans ...@@ -57,63 +57,63 @@ namespace dtrans
* XInitialization * XInitialization
*/ */
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); throw(css::uno::Exception, css::uno::RuntimeException);
/* /*
* XServiceInfo * XServiceInfo
*/ */
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
/* /*
* XClipboard * XClipboard
*/ */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual void SAL_CALL setContents( virtual void SAL_CALL setContents(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans,
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual OUString SAL_CALL getName() virtual OUString SAL_CALL getName()
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
/* /*
* XClipboardEx * XClipboardEx
*/ */
virtual sal_Int8 SAL_CALL getRenderingCapabilities() virtual sal_Int8 SAL_CALL getRenderingCapabilities()
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
/* /*
* XClipboardNotifier * XClipboardNotifier
*/ */
virtual void SAL_CALL addClipboardListener( virtual void SAL_CALL addClipboardListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual void SAL_CALL removeClipboardListener( virtual void SAL_CALL removeClipboardListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
}; };
} }
::com::sun::star::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); css::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance( css::uno::Reference< css::uno::XInterface > SAL_CALL GenericClipboard_createInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
#endif #endif
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
class CDTransObjFactory class CDTransObjFactory
{ {
public: public:
virtual IDataObjectPtr SAL_CALL createDataObjFromTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, virtual IDataObjectPtr SAL_CALL createDataObjFromTransferable( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& refXTransferable ); const css::uno::Reference< css::datatransfer::XTransferable >& refXTransferable );
virtual com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > SAL_CALL createTransferableFromDataObj( virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL createTransferableFromDataObj(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, IDataObjectPtr pIDataObject ); const css::uno::Reference< css::uno::XComponentContext >& rxContext, IDataObjectPtr pIDataObject );
}; };
#endif #endif
......
...@@ -49,27 +49,27 @@ public: ...@@ -49,27 +49,27 @@ public:
protected: protected:
CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ); CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard );
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( ) css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
void SAL_CALL setContents( void SAL_CALL setContents(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable,
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException ); OUString SAL_CALL getName( ) throw( css::uno::RuntimeException );
// XClipboardEx // XClipboardEx
sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( ::com::sun::star::uno::RuntimeException ); sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( css::uno::RuntimeException );
// XFlushableClipboard // XFlushableClipboard
void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException ); void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException );
// XComponent // XComponent
void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException ); void SAL_CALL dispose( ) throw( css::uno::RuntimeException );
// member functions // member functions
...@@ -82,7 +82,7 @@ private: ...@@ -82,7 +82,7 @@ private:
void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller ); void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller );
private: private:
OUString m_itsName; OUString m_itsName;
CMtaOleClipboard m_MtaOleClipboard; CMtaOleClipboard m_MtaOleClipboard;
CWinClipboard* m_pWinClipboard; CWinClipboard* m_pWinClipboard;
CXNotifyingDataObject* m_pCurrentClipContent; CXNotifyingDataObject* m_pCurrentClipContent;
......
...@@ -215,7 +215,7 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( ) ...@@ -215,7 +215,7 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
} }
} }
} }
catch(const ::com::sun::star::lang::DisposedException&) catch(const css::lang::DisposedException&)
{ {
OSL_FAIL("Service Manager disposed"); OSL_FAIL("Service Manager disposed");
......
...@@ -61,44 +61,44 @@ protected: ...@@ -61,44 +61,44 @@ protected:
class CWinClipboard : class CWinClipboard :
public CWinClipboardDummy, public CWinClipboardDummy,
public cppu::WeakComponentImplHelper< public cppu::WeakComponentImplHelper<
::com::sun::star::datatransfer::clipboard::XSystemClipboard, css::datatransfer::clipboard::XSystemClipboard,
::com::sun::star::datatransfer::clipboard::XFlushableClipboard, css::datatransfer::clipboard::XFlushableClipboard,
::com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
CWinClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, CWinClipboard( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& aClipboardName ); const OUString& aClipboardName );
// XClipboard // XClipboard
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( ) virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
virtual void SAL_CALL setContents( virtual void SAL_CALL setContents(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable,
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
virtual OUString SAL_CALL getName( ) virtual OUString SAL_CALL getName( )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
// XFlushableClipboard // XFlushableClipboard
virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException );
// XClipboardEx // XClipboardEx
virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( css::uno::RuntimeException );
// XClipboardNotifier // XClipboardNotifier
virtual void SAL_CALL addClipboardListener( virtual void SAL_CALL addClipboardListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
virtual void SAL_CALL removeClipboardListener( virtual void SAL_CALL removeClipboardListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
// overwrite base class method, which is called // overwrite base class method, which is called
// by base class dispose function // by base class dispose function
...@@ -108,20 +108,20 @@ public: ...@@ -108,20 +108,20 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
private: private:
void SAL_CALL notifyAllClipboardListener( ); void SAL_CALL notifyAllClipboardListener( );
private: private:
::std::unique_ptr< CWinClipbImpl > m_pImpl; ::std::unique_ptr< CWinClipbImpl > m_pImpl;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
friend class CWinClipbImpl; friend class CWinClipbImpl;
}; };
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp>
// used as shortcut when drag-source and drop-target are the same // used as shortcut when drag-source and drop-target are the same
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > g_XTransferable; css::uno::Reference< css::datatransfer::XTransferable > g_XTransferable;
//<-- TRA //<-- TRA
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
// This maps key states as occur as parameter, e.g. in IDropTarget::DragEnter, // 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). // css::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 // 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 // used when the user expect a menu to appear when he drops. The menu then
...@@ -51,13 +51,13 @@ ...@@ -51,13 +51,13 @@
sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 sourceActions); 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). // ( css::datatransfer::dnd::DNDConstants).
// The argument can be a combination of different DROPEFFECTS, // The argument can be a combination of different DROPEFFECTS,
// 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 actions. // appropriate actions.
sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect); sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect);
// The function maps actions ( com::sun::star::datatransfer::dnd::DNDConstants) // The function maps actions ( css::datatransfer::dnd::DNDConstants)
// to window DROPEFFECTs. // to window DROPEFFECTs.
// The argument can be a combination of different actions // 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
......
...@@ -523,8 +523,8 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter( ...@@ -523,8 +523,8 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
return bRet; return bRet;
} }
::com::sun::star::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId ) css::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
Any retVal; Any retVal;
......
...@@ -34,69 +34,70 @@ ...@@ -34,69 +34,70 @@
class CDTransObjFactory; class CDTransObjFactory;
class CFormatEtc; class CFormatEtc;
class CDOTransferable : public ::cppu::WeakImplHelper< ::com::sun::star::datatransfer::XTransferable, class CDOTransferable : public ::cppu::WeakImplHelper<
::com::sun::star::datatransfer::XSystemTransferable> css::datatransfer::XTransferable,
css::datatransfer::XSystemTransferable>
{ {
public: public:
typedef com::sun::star::uno::Sequence< sal_Int8 > ByteSequence_t; typedef css::uno::Sequence< sal_Int8 > ByteSequence_t;
// XTransferable // XTransferable
virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
throw( ::com::sun::star::uno::RuntimeException ); throw( css::uno::RuntimeException );
// XSystemTransferable // XSystemTransferable
virtual ::com::sun::star::uno::Any SAL_CALL getData( const com::sun::star::uno::Sequence<sal_Int8>& aProcessId ) throw virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId ) throw
(::com::sun::star::uno::RuntimeException); (css::uno::RuntimeException);
private: private:
// should be created only by CDTransObjFactory // should be created only by CDTransObjFactory
explicit CDOTransferable( explicit CDOTransferable(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const css::uno::Reference< css::uno::XComponentContext >& rxContext,
IDataObjectPtr rDataObject ); IDataObjectPtr rDataObject );
// some helper functions // some helper functions
void SAL_CALL initFlavorList( ); void SAL_CALL initFlavorList( );
void SAL_CALL addSupportedFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor ); void SAL_CALL addSupportedFlavor( const css::datatransfer::DataFlavor& aFlavor );
com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ); css::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc );
ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc ); ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc );
OUString SAL_CALL synthesizeUnicodeText( ); OUString SAL_CALL synthesizeUnicodeText( );
void SAL_CALL clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence ); void SAL_CALL clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence );
::com::sun::star::uno::Any SAL_CALL byteStreamToAny( ByteSequence_t& aByteStream, const com::sun::star::uno::Type& aRequestedDataType ); css::uno::Any SAL_CALL byteStreamToAny( ByteSequence_t& aByteStream, const css::uno::Type& aRequestedDataType );
OUString SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream ); OUString SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream );
LCID SAL_CALL getLocaleFromClipboard( ); LCID SAL_CALL getLocaleFromClipboard( );
sal_Bool SAL_CALL compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs, sal_Bool SAL_CALL compareDataFlavors( const css::datatransfer::DataFlavor& lhs,
const com::sun::star::datatransfer::DataFlavor& rhs ); const css::datatransfer::DataFlavor& rhs );
sal_Bool SAL_CALL cmpFullMediaType( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs, sal_Bool SAL_CALL cmpFullMediaType( const css::uno::Reference< css::datatransfer::XMimeContentType >& xLhs,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xRhs ) const; const css::uno::Reference< css::datatransfer::XMimeContentType >& xRhs ) const;
sal_Bool SAL_CALL cmpAllContentTypeParameter( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs, sal_Bool SAL_CALL cmpAllContentTypeParameter( const css::uno::Reference< css::datatransfer::XMimeContentType >& xLhs,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xRhs ) const; const css::uno::Reference< css::datatransfer::XMimeContentType >& xRhs ) const;
private: private:
IDataObjectPtr m_rDataObject; IDataObjectPtr m_rDataObject;
com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor > m_FlavorList; css::uno::Sequence< css::datatransfer::DataFlavor > m_FlavorList;
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; const css::uno::Reference< css::uno::XComponentContext > m_xContext;
CDataFormatTranslator m_DataFormatTranslator; CDataFormatTranslator m_DataFormatTranslator;
com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory > m_rXMimeCntFactory; css::uno::Reference< css::datatransfer::XMimeContentTypeFactory > m_rXMimeCntFactory;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
sal_Bool m_bUnicodeRegistered; sal_Bool m_bUnicodeRegistered;
CLIPFORMAT m_TxtFormatOnClipboard; CLIPFORMAT m_TxtFormatOnClipboard;
// non supported operations // non supported operations
private: private:
......
...@@ -41,10 +41,10 @@ class CFormatEtc; ...@@ -41,10 +41,10 @@ class CFormatEtc;
class CDataFormatTranslator class CDataFormatTranslator
{ {
public: public:
CDataFormatTranslator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); CDataFormatTranslator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
CFormatEtc getFormatEtcFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; CFormatEtc getFormatEtcFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) const;
com::sun::star::datatransfer::DataFlavor getDataFlavorFromFormatEtc( css::datatransfer::DataFlavor getDataFlavorFromFormatEtc(
const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const; const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const;
CFormatEtc SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ) const; CFormatEtc SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ) const;
...@@ -61,7 +61,7 @@ private: ...@@ -61,7 +61,7 @@ private:
OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const; OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const;
private: private:
com::sun::star::uno::Reference< com::sun::star::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator; css::uno::Reference< css::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator;
}; };
#endif #endif
......
...@@ -96,26 +96,26 @@ class CDataFormatTranslator; ...@@ -96,26 +96,26 @@ class CDataFormatTranslator;
class CFormatRegistrar class CFormatRegistrar
{ {
public: public:
CFormatRegistrar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, CFormatRegistrar( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const CDataFormatTranslator& aDataFormatTranslator ); const CDataFormatTranslator& aDataFormatTranslator );
void SAL_CALL RegisterFormats( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable, void SAL_CALL RegisterFormats( const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable,
CFormatEtcContainer& aFormatEtcContainer ); CFormatEtcContainer& aFormatEtcContainer );
sal_Bool SAL_CALL hasSynthesizedLocale( ) const; sal_Bool SAL_CALL hasSynthesizedLocale( ) const;
LCID SAL_CALL getSynthesizedLocale( ) const; LCID SAL_CALL getSynthesizedLocale( ) const;
sal_uInt32 SAL_CALL getRegisteredTextCodePage( ) const; sal_uInt32 SAL_CALL getRegisteredTextCodePage( ) const;
com::sun::star::datatransfer::DataFlavor SAL_CALL getRegisteredTextFlavor( ) const; css::datatransfer::DataFlavor SAL_CALL getRegisteredTextFlavor( ) const;
sal_Bool SAL_CALL isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) const; sal_Bool SAL_CALL isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) const;
sal_Bool SAL_CALL needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) const; sal_Bool SAL_CALL needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) const;
private: private:
sal_Bool SAL_CALL isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const; sal_Bool SAL_CALL isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const;
OUString SAL_CALL getCharsetFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor ); OUString SAL_CALL getCharsetFromDataFlavor( const css::datatransfer::DataFlavor& aFlavor );
sal_Bool SAL_CALL hasUnicodeFlavor( sal_Bool SAL_CALL hasUnicodeFlavor(
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable ) const; const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable ) const;
sal_Bool SAL_CALL findLocaleForTextCodePage( ); sal_Bool SAL_CALL findLocaleForTextCodePage( );
...@@ -128,9 +128,9 @@ private: ...@@ -128,9 +128,9 @@ private:
private: private:
const CDataFormatTranslator& m_DataFormatTranslator; const CDataFormatTranslator& m_DataFormatTranslator;
sal_Bool m_bHasSynthesizedLocale; sal_Bool m_bHasSynthesizedLocale;
com::sun::star::datatransfer::DataFlavor m_RegisteredTextFlavor; css::datatransfer::DataFlavor m_RegisteredTextFlavor;
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; const css::uno::Reference< css::uno::XComponentContext > m_xContext;
static LCID m_TxtLocale; static LCID m_TxtLocale;
static sal_uInt32 m_TxtCodePage; static sal_uInt32 m_TxtCodePage;
......
...@@ -36,29 +36,29 @@ ...@@ -36,29 +36,29 @@
input: input:
aMetaFilePict - a sequence of bytes containing a METAFILEPICT struct aMetaFilePict - a sequence of bytes containing a METAFILEPICT struct
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aMetaFilePict ); css::uno::Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( css::uno::Sequence< sal_Int8 >& aMetaFilePict );
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile ); css::uno::Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile );
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
input: input:
aByteStream - a sequence of bytes containing a openoffice metafile aByteStream - a sequence of bytes containing a openoffice metafile
picture with a leading METAFILEHEADER picture with a leading METAFILEHEADER
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aOOMetaFilePict ); HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( css::uno::Sequence< sal_Int8 >& aOOMetaFilePict );
HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aOOMetaFilePict ); HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( css::uno::Sequence< sal_Int8 >& aOOMetaFilePict );
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
input: input:
aWinDIB - sequence of bytes containing a windows device independent aWinDIB - sequence of bytes containing a windows device independent
bitmap bitmap
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const com::sun::star::uno::Sequence< sal_Int8 >& aWinDIB ); css::uno::Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const css::uno::Sequence< sal_Int8 >& aWinDIB );
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
input: input:
aWinDIB - sequence of bytes containing a windows bitmap handle aWinDIB - sequence of bytes containing a windows bitmap handle
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP ); css::uno::Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP );
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
input: input:
...@@ -66,7 +66,7 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP ); ...@@ -66,7 +66,7 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP );
May contain CF_DIBV5 or CF_DIB, but removing the BITMAPFILEHEADER May contain CF_DIBV5 or CF_DIB, but removing the BITMAPFILEHEADER
is always the same size is always the same size
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( com::sun::star::uno::Sequence< sal_Int8 >& aOOBmp ); css::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( css::uno::Sequence< sal_Int8 >& aOOBmp );
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
input: input:
...@@ -75,14 +75,14 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( com::sun::star ...@@ -75,14 +75,14 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( com::sun::star
the Format is described in the MSDN Library under HTML Clipboard the Format is described in the MSDN Library under HTML Clipboard
Format Format
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( com::sun::star::uno::Sequence< sal_Int8 >& aTextHtml ); css::uno::Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( css::uno::Sequence< sal_Int8 >& aTextHtml );
/** /**
Return a FileList in which Windows Shell Links (lnk) are resolved. Return a FileList in which Windows Shell Links (lnk) are resolved.
If for what ever reason a resolution is not possible leave the If for what ever reason a resolution is not possible leave the
original lnk file. original lnk file.
*/ */
com::sun::star::uno::Sequence< sal_Int8 > CF_HDROPToFileList(HGLOBAL hGlobal); css::uno::Sequence< sal_Int8 > CF_HDROPToFileList(HGLOBAL hGlobal);
#endif #endif
......
...@@ -47,8 +47,8 @@ class CXNotifyingDataObject : public IDataObject ...@@ -47,8 +47,8 @@ class CXNotifyingDataObject : public IDataObject
public: public:
CXNotifyingDataObject( CXNotifyingDataObject(
const IDataObjectPtr& aIDataObject, const IDataObjectPtr& aIDataObject,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable, const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner >& aXClipOwner, const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& aXClipOwner,
CWinClipbImpl* theWinClipImpl ); CWinClipbImpl* theWinClipImpl );
virtual ~CXNotifyingDataObject() {} virtual ~CXNotifyingDataObject() {}
...@@ -77,11 +77,11 @@ private: ...@@ -77,11 +77,11 @@ private:
void SAL_CALL lostOwnership( ); void SAL_CALL lostOwnership( );
private: private:
sal_Int32 m_nRefCnt; sal_Int32 m_nRefCnt;
IDataObjectPtr m_aIDataObject; IDataObjectPtr m_aIDataObject;
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > m_XTransferable; const css::uno::Reference< css::datatransfer::XTransferable > m_XTransferable;
const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner > m_XClipboardOwner; const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_XClipboardOwner;
CWinClipbImpl* m_pWinClipImpl; CWinClipbImpl* m_pWinClipImpl;
friend class CWinClipbImpl; friend class CWinClipbImpl;
}; };
......
...@@ -62,8 +62,8 @@ class CStgTransferHelper; ...@@ -62,8 +62,8 @@ class CStgTransferHelper;
class CXTDataObject : public IDataObject class CXTDataObject : public IDataObject
{ {
public: public:
CXTDataObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, CXTDataObject( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& aXTransferable ); const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable );
virtual ~CXTDataObject() {} virtual ~CXTDataObject() {}
// ole interface implementation // ole interface implementation
...@@ -87,7 +87,7 @@ public: ...@@ -87,7 +87,7 @@ public:
operator IDataObject*( ); operator IDataObject*( );
private: private:
com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const; css::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const;
void SAL_CALL renderDataAndSetupStgMedium( const sal_Int8* lpStorage, void SAL_CALL renderDataAndSetupStgMedium( const sal_Int8* lpStorage,
const FORMATETC& fetc, const FORMATETC& fetc,
...@@ -117,11 +117,11 @@ private: ...@@ -117,11 +117,11 @@ private:
private: private:
LONG m_nRefCnt; LONG m_nRefCnt;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_XTransferable; css::uno::Reference< css::datatransfer::XTransferable > m_XTransferable;
CFormatEtcContainer m_FormatEtcContainer; CFormatEtcContainer m_FormatEtcContainer;
sal_Bool m_bFormatEtcContainerInitialized; sal_Bool m_bFormatEtcContainerInitialized;
CDataFormatTranslator m_DataFormatTranslator; CDataFormatTranslator m_DataFormatTranslator;
CFormatRegistrar m_FormatRegistrar; CFormatRegistrar m_FormatRegistrar;
}; };
class CEnumFormatEtc : public IEnumFORMATETC class CEnumFormatEtc : public IEnumFORMATETC
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
#define EMPTY_OUSTR OUString() #define EMPTY_OUSTR OUString()
const OUString Windows_FormatName ("windows_formatname"); const OUString Windows_FormatName ("windows_formatname");
const com::sun::star::uno::Type CppuType_ByteSequence = cppu::UnoType<com::sun::star::uno::Sequence<sal_Int8>>::get(); const css::uno::Type CppuType_ByteSequence = cppu::UnoType<css::uno::Sequence<sal_Int8>>::get();
const com::sun::star::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); const css::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get();
// namespace directives // namespace directives
...@@ -79,7 +79,7 @@ FormatEntry::FormatEntry( ...@@ -79,7 +79,7 @@ FormatEntry::FormatEntry(
const char* human_presentable_name, const char* human_presentable_name,
const char* native_format_name, const char* native_format_name,
CLIPFORMAT std_clipboard_format_id, CLIPFORMAT std_clipboard_format_id,
::com::sun::star::uno::Type const & cppu_type) css::uno::Type const & cppu_type)
{ {
aDataFlavor.MimeType = OUString::createFromAscii(mime_content_type); aDataFlavor.MimeType = OUString::createFromAscii(mime_content_type);
aDataFlavor.HumanPresentableName = OUString::createFromAscii(human_presentable_name); aDataFlavor.HumanPresentableName = OUString::createFromAscii(human_presentable_name);
......
...@@ -48,61 +48,61 @@ struct FormatEntry ...@@ -48,61 +48,61 @@ struct FormatEntry
const char* human_presentable_name, const char* human_presentable_name,
const char* native_format_name, const char* native_format_name,
CLIPFORMAT std_clipboard_format_id, CLIPFORMAT std_clipboard_format_id,
com::sun::star::uno::Type const & cppu_type css::uno::Type const & cppu_type
); );
com::sun::star::datatransfer::DataFlavor aDataFlavor; css::datatransfer::DataFlavor aDataFlavor;
OUString aNativeFormatName; OUString aNativeFormatName;
sal_Int32 aStandardFormatId; sal_Int32 aStandardFormatId;
}; };
// CDataFormatTranslator // CDataFormatTranslator
class CDataFormatTranslator : public class CDataFormatTranslator : public
cppu::WeakImplHelper< com::sun::star::datatransfer::XDataFormatTranslator, \ cppu::WeakImplHelper< css::datatransfer::XDataFormatTranslator,
com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
CDataFormatTranslator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); CDataFormatTranslator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// XDataFormatTranslator // XDataFormatTranslator
virtual ::com::sun::star::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const ::com::sun::star::datatransfer::DataFlavor& aDataFlavor ) virtual css::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const ::com::sun::star::uno::Any& aSysDataType ) virtual css::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const css::uno::Any& aSysDataType )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
private: private:
void SAL_CALL initTranslationTable( ); void SAL_CALL initTranslationTable( );
void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, css::datatransfer::DataFlavor& aDataFlavor ) const;
void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, css::datatransfer::DataFlavor& aDataFlavor ) const;
void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, com::sun::star::uno::Any& aAny ) const; void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, css::uno::Any& aAny ) const;
void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) const; void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, css::uno::Any& aAny ) const;
void SAL_CALL findStdFormatIdOrNativeFormatNameForFullMediaType( void SAL_CALL findStdFormatIdOrNativeFormatNameForFullMediaType(
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory, const css::uno::Reference< css::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory,
const OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const; const OUString& aFullMediaType, css::uno::Any& aAny ) const;
sal_Bool isTextPlainMediaType( const OUString& fullMediaType ) const; sal_Bool isTextPlainMediaType( const OUString& fullMediaType ) const;
com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, ::com::sun::star::uno::Type dtype ); css::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, css::uno::Type dtype );
private: private:
std::vector< FormatEntry > m_TranslTable; std::vector< FormatEntry > m_TranslTable;
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; const css::uno::Reference< css::uno::XComponentContext > m_xContext;
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment