diff options
19 files changed, 203 insertions, 202 deletions
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx index 7ce1899baf39..971bb910e856 100644 --- a/dtrans/source/cnttype/mcnttfactory.hxx +++ b/dtrans/source/cnttype/mcnttfactory.hxx @@ -27,8 +27,8 @@ #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> class CMimeContentTypeFactory : public - cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentTypeFactory, \ - com::sun::star::lang::XServiceInfo > + cppu::WeakImplHelper< css::datatransfer::XMimeContentTypeFactory, + css::lang::XServiceInfo > { public: @@ -36,19 +36,19 @@ public: // XMimeContentTypeFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) + throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo 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 ) - 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( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::osl::Mutex m_aMutex; diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index a4126c6c6a53..d0d31a392cbf 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -29,28 +29,28 @@ #include <map> class CMimeContentType : public - cppu::WeakImplHelper< com::sun::star::datatransfer::XMimeContentType > + cppu::WeakImplHelper< css::datatransfer::XMimeContentType > { public: CMimeContentType( const OUString& aCntType ); // XMimeContentType - virtual OUString SAL_CALL getMediaType( ) throw(::com::sun::star::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 getFullMediaType( ) 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(css::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( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getParameters( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 ) - 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: - 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 acceptSym( const OUString& pSymTlb ); void SAL_CALL skipSpaces(); diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index 2d9a1d42baeb..b52dae2b545a 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -30,15 +30,15 @@ #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 { class ClipboardManager : public ::cppu::WeakComponentImplHelper < - ::com::sun::star::datatransfer::clipboard::XClipboardManager, - ::com::sun::star::lang::XEventListener, - ::com::sun::star::lang::XServiceInfo > + css::datatransfer::clipboard::XClipboardManager, + css::lang::XEventListener, + css::lang::XServiceInfo > { ClipboardMap m_aClipboardMap; ::osl::Mutex m_aMutex; @@ -57,54 +57,54 @@ namespace dtrans */ virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); 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( ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException); /* * XComponent */ virtual void SAL_CALL dispose() - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); /* * XEventListener */ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw(css::uno::RuntimeException); /* * XClipboardManager */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) + throw(css::container::NoSuchElementException, + css::uno::RuntimeException); - virtual void SAL_CALL addClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addClipboard( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard ) + throw(css::lang::IllegalArgumentException, + css::container::ElementExistException, + css::uno::RuntimeException); 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( ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL listClipboardNames( ) + throw(css::uno::RuntimeException); }; } -::com::sun::star::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); +css::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); +css::uno::Reference< css::uno::XInterface > SAL_CALL ClipboardManager_createInstance( + const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory); #endif diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index 542a847de0cd..41d7cdc6f640 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/dtrans/source/generic/generic_clipboard.hxx @@ -34,17 +34,17 @@ namespace dtrans { - class GenericClipboard : public ::cppu::WeakComponentImplHelper < \ - ::com::sun::star::datatransfer::clipboard::XClipboardEx, \ - ::com::sun::star::datatransfer::clipboard::XClipboardNotifier, \ - ::com::sun::star::lang::XServiceInfo, \ - ::com::sun::star::lang::XInitialization > + class GenericClipboard : public ::cppu::WeakComponentImplHelper < + css::datatransfer::clipboard::XClipboardEx, + css::datatransfer::clipboard::XClipboardNotifier, + css::lang::XServiceInfo, + css::lang::XInitialization > { ::osl::Mutex m_aMutex; - OUString m_aName; + OUString m_aName; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; + css::uno::Reference< css::datatransfer::XTransferable > m_aContents; + css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner; sal_Bool m_bInitialized; virtual ~GenericClipboard(); @@ -57,63 +57,63 @@ namespace dtrans * XInitialization */ - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, css::uno::RuntimeException); /* * XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); 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( ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException); /* * XClipboard */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() + throw(css::uno::RuntimeException); virtual void SAL_CALL setContents( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::datatransfer::XTransferable >& xTrans, + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + throw(css::uno::RuntimeException); virtual OUString SAL_CALL getName() - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); /* * XClipboardEx */ virtual sal_Int8 SAL_CALL getRenderingCapabilities() - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); /* * XClipboardNotifier */ virtual void SAL_CALL addClipboardListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) + throw(css::uno::RuntimeException); virtual void SAL_CALL removeClipboardListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) + throw(css::uno::RuntimeException); }; } -::com::sun::star::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); +css::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); +css::uno::Reference< css::uno::XInterface > SAL_CALL GenericClipboard_createInstance( + const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory); #endif diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx index 23ca93e25206..483286ef785e 100644 --- a/dtrans/source/inc/DtObjFactory.hxx +++ b/dtrans/source/inc/DtObjFactory.hxx @@ -28,10 +28,10 @@ class CDTransObjFactory { public: - virtual IDataObjectPtr SAL_CALL createDataObjFromTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& refXTransferable ); - virtual com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > SAL_CALL createTransferableFromDataObj( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, IDataObjectPtr pIDataObject ); + virtual IDataObjectPtr SAL_CALL createDataObjFromTransferable( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::datatransfer::XTransferable >& refXTransferable ); + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL createTransferableFromDataObj( + const css::uno::Reference< css::uno::XComponentContext >& rxContext, IDataObjectPtr pIDataObject ); }; #endif diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx index a5da94cca792..8123bf7e2862 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.hxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx @@ -49,27 +49,27 @@ public: protected: CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( ) - throw( ::com::sun::star::uno::RuntimeException ); + css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ) + throw( css::uno::RuntimeException ); void SAL_CALL setContents( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + throw( css::uno::RuntimeException ); - OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException ); + OUString SAL_CALL getName( ) throw( css::uno::RuntimeException ); // XClipboardEx - sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( ::com::sun::star::uno::RuntimeException ); + sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( css::uno::RuntimeException ); // XFlushableClipboard - void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException ); + void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException ); // XComponent - void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL dispose( ) throw( css::uno::RuntimeException ); // member functions @@ -82,7 +82,7 @@ private: void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller ); private: - OUString m_itsName; + OUString m_itsName; CMtaOleClipboard m_MtaOleClipboard; CWinClipboard* m_pWinClipboard; CXNotifyingDataObject* m_pCurrentClipContent; diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index e5996bb4e5a5..b648527d65fd 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -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"); diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx index 6e74deb21dfa..f5ba95f89fa1 100644 --- a/dtrans/source/win32/clipb/WinClipboard.hxx +++ b/dtrans/source/win32/clipb/WinClipboard.hxx @@ -61,44 +61,44 @@ protected: class CWinClipboard : public CWinClipboardDummy, public cppu::WeakComponentImplHelper< - ::com::sun::star::datatransfer::clipboard::XSystemClipboard, - ::com::sun::star::datatransfer::clipboard::XFlushableClipboard, - ::com::sun::star::lang::XServiceInfo > + css::datatransfer::clipboard::XSystemClipboard, + css::datatransfer::clipboard::XFlushableClipboard, + css::lang::XServiceInfo > { 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 ); // XClipboard - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( ) - throw( ::com::sun::star::uno::RuntimeException ); + virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ) + throw( css::uno::RuntimeException ); virtual void SAL_CALL setContents( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) + throw( css::uno::RuntimeException ); virtual OUString SAL_CALL getName( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException ); // XClipboardEx - virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( css::uno::RuntimeException ); // XClipboardNotifier virtual void SAL_CALL addClipboardListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) + throw( css::uno::RuntimeException ); virtual void SAL_CALL removeClipboardListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) + throw( css::uno::RuntimeException ); // overwrite base class method, which is called // by base class dispose function @@ -108,20 +108,20 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); 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( ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException); private: void SAL_CALL notifyAllClipboardListener( ); private: - ::std::unique_ptr< CWinClipbImpl > m_pImpl; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + ::std::unique_ptr< CWinClipbImpl > m_pImpl; + css::uno::Reference< css::uno::XComponentContext > m_xContext; friend class CWinClipbImpl; }; diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx index f36297e349b1..fcddef22e6c1 100644 --- a/dtrans/source/win32/dnd/globals.cxx +++ b/dtrans/source/win32/dnd/globals.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> // 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 diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx index a6214e95a168..a6f01d9b5a0d 100644 --- a/dtrans/source/win32/dnd/globals.hxx +++ b/dtrans/source/win32/dnd/globals.hxx @@ -38,7 +38,7 @@ // This maps key states as occur as parameter, e.g. in IDropTarget::DragEnter, // 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 // 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 @@ -51,13 +51,13 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 sourceActions); // 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, // 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) +// The function maps actions ( css::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 diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 0f2917388560..5a7a0b430c3c 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -523,8 +523,8 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter( return bRet; } -::com::sun::star::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId ) - throw (::com::sun::star::uno::RuntimeException) +css::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId ) + throw (css::uno::RuntimeException) { Any retVal; diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index 74064cac8155..cf3af73dc4f2 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -34,69 +34,70 @@ class CDTransObjFactory; class CFormatEtc; -class CDOTransferable : public ::cppu::WeakImplHelper< ::com::sun::star::datatransfer::XTransferable, - ::com::sun::star::datatransfer::XSystemTransferable> +class CDOTransferable : public ::cppu::WeakImplHelper< + css::datatransfer::XTransferable, + css::datatransfer::XSystemTransferable> { public: - typedef com::sun::star::uno::Sequence< sal_Int8 > ByteSequence_t; + typedef css::uno::Sequence< sal_Int8 > ByteSequence_t; // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) + throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw( ::com::sun::star::uno::RuntimeException ); + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) + throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) + throw( css::uno::RuntimeException ); // XSystemTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getData( const com::sun::star::uno::Sequence<sal_Int8>& aProcessId ) throw - (::com::sun::star::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId ) throw + (css::uno::RuntimeException); private: // should be created only by CDTransObjFactory explicit CDOTransferable( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, IDataObjectPtr rDataObject ); // some helper functions void SAL_CALL initFlavorList( ); - void SAL_CALL addSupportedFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor ); - com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ); + void SAL_CALL addSupportedFlavor( const css::datatransfer::DataFlavor& aFlavor ); + css::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ); ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc ); OUString SAL_CALL synthesizeUnicodeText( ); 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 ); LCID SAL_CALL getLocaleFromClipboard( ); - sal_Bool SAL_CALL compareDataFlavors( const com::sun::star::datatransfer::DataFlavor& lhs, - const com::sun::star::datatransfer::DataFlavor& rhs ); + sal_Bool SAL_CALL compareDataFlavors( const css::datatransfer::DataFlavor& lhs, + const css::datatransfer::DataFlavor& rhs ); - sal_Bool SAL_CALL cmpFullMediaType( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xLhs, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xRhs ) const; + sal_Bool SAL_CALL cmpFullMediaType( const css::uno::Reference< css::datatransfer::XMimeContentType >& xLhs, + 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, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentType >& xRhs ) const; + sal_Bool SAL_CALL cmpAllContentTypeParameter( const css::uno::Reference< css::datatransfer::XMimeContentType >& xLhs, + const css::uno::Reference< css::datatransfer::XMimeContentType >& xRhs ) const; private: IDataObjectPtr m_rDataObject; - com::sun::star::uno::Sequence< com::sun::star::datatransfer::DataFlavor > m_FlavorList; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - CDataFormatTranslator m_DataFormatTranslator; - com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory > m_rXMimeCntFactory; - ::osl::Mutex m_aMutex; - sal_Bool m_bUnicodeRegistered; - CLIPFORMAT m_TxtFormatOnClipboard; + css::uno::Sequence< css::datatransfer::DataFlavor > m_FlavorList; + const css::uno::Reference< css::uno::XComponentContext > m_xContext; + CDataFormatTranslator m_DataFormatTranslator; + css::uno::Reference< css::datatransfer::XMimeContentTypeFactory > m_rXMimeCntFactory; + ::osl::Mutex m_aMutex; + sal_Bool m_bUnicodeRegistered; + CLIPFORMAT m_TxtFormatOnClipboard; // non supported operations private: diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx index 12c105431b0f..f3a00cd698a2 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx @@ -41,10 +41,10 @@ class CFormatEtc; class CDataFormatTranslator { 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; - com::sun::star::datatransfer::DataFlavor getDataFlavorFromFormatEtc( + CFormatEtc getFormatEtcFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) const; + css::datatransfer::DataFlavor getDataFlavorFromFormatEtc( const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const; CFormatEtc SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ) const; @@ -61,7 +61,7 @@ private: OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const; private: - com::sun::star::uno::Reference< com::sun::star::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator; + css::uno::Reference< css::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator; }; #endif diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx index 97ee1ed9b67c..21823211d76a 100644 --- a/dtrans/source/win32/dtobj/FetcList.hxx +++ b/dtrans/source/win32/dtobj/FetcList.hxx @@ -96,26 +96,26 @@ class CDataFormatTranslator; class CFormatRegistrar { 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 ); - 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 ); sal_Bool SAL_CALL hasSynthesizedLocale( ) const; LCID SAL_CALL getSynthesizedLocale( ) 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 needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) const; private: 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( - 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( ); @@ -128,9 +128,9 @@ private: private: const CDataFormatTranslator& m_DataFormatTranslator; 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 sal_uInt32 m_TxtCodePage; diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx index 8ee93a2935c2..cbfa17de2b3d 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.hxx +++ b/dtrans/source/win32/dtobj/FmtFilter.hxx @@ -36,29 +36,29 @@ input: 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 ); -com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile ); +css::uno::Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( css::uno::Sequence< sal_Int8 >& aMetaFilePict ); +css::uno::Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile ); /*------------------------------------------------------------------------ input: aByteStream - a sequence of bytes containing a openoffice metafile picture with a leading METAFILEHEADER ------------------------------------------------------------------------*/ -HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aOOMetaFilePict ); -HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aOOMetaFilePict ); +HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( css::uno::Sequence< sal_Int8 >& aOOMetaFilePict ); +HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( css::uno::Sequence< sal_Int8 >& aOOMetaFilePict ); /*------------------------------------------------------------------------ input: aWinDIB - sequence of bytes containing a windows device independent 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: 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: @@ -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 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: @@ -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 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. If for what ever reason a resolution is not possible leave the original lnk file. */ -com::sun::star::uno::Sequence< sal_Int8 > CF_HDROPToFileList(HGLOBAL hGlobal); +css::uno::Sequence< sal_Int8 > CF_HDROPToFileList(HGLOBAL hGlobal); #endif diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx index fbe45cb91b36..53cdaecea0c4 100644 --- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx +++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx @@ -47,8 +47,8 @@ class CXNotifyingDataObject : public IDataObject public: CXNotifyingDataObject( const IDataObjectPtr& aIDataObject, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable, - const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner >& aXClipOwner, + const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable, + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& aXClipOwner, CWinClipbImpl* theWinClipImpl ); virtual ~CXNotifyingDataObject() {} @@ -77,11 +77,11 @@ private: void SAL_CALL lostOwnership( ); private: - sal_Int32 m_nRefCnt; - IDataObjectPtr m_aIDataObject; - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > m_XTransferable; - const com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboardOwner > m_XClipboardOwner; - CWinClipbImpl* m_pWinClipImpl; + sal_Int32 m_nRefCnt; + IDataObjectPtr m_aIDataObject; + const css::uno::Reference< css::datatransfer::XTransferable > m_XTransferable; + const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_XClipboardOwner; + CWinClipbImpl* m_pWinClipImpl; friend class CWinClipbImpl; }; diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx index 9577cb5143c5..3d8d71c2c24a 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.hxx +++ b/dtrans/source/win32/dtobj/XTDataObject.hxx @@ -62,8 +62,8 @@ class CStgTransferHelper; class CXTDataObject : public IDataObject { public: - CXTDataObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& aXTransferable ); + CXTDataObject( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable ); virtual ~CXTDataObject() {} // ole interface implementation @@ -87,7 +87,7 @@ public: operator IDataObject*( ); 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, const FORMATETC& fetc, @@ -117,11 +117,11 @@ private: private: LONG m_nRefCnt; - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_XTransferable; - CFormatEtcContainer m_FormatEtcContainer; - sal_Bool m_bFormatEtcContainerInitialized; - CDataFormatTranslator m_DataFormatTranslator; - CFormatRegistrar m_FormatRegistrar; + css::uno::Reference< css::datatransfer::XTransferable > m_XTransferable; + CFormatEtcContainer m_FormatEtcContainer; + sal_Bool m_bFormatEtcContainerInitialized; + CDataFormatTranslator m_DataFormatTranslator; + CFormatRegistrar m_FormatRegistrar; }; class CEnumFormatEtc : public IEnumFORMATETC diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 7fe0b55d98bd..b31e16f0fe59 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -45,8 +45,8 @@ #define EMPTY_OUSTR OUString() 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 com::sun::star::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); +const css::uno::Type CppuType_ByteSequence = cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(); +const css::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); // namespace directives @@ -79,7 +79,7 @@ FormatEntry::FormatEntry( const char* human_presentable_name, const char* native_format_name, 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.HumanPresentableName = OUString::createFromAscii(human_presentable_name); diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 138b3c7e9d6a..07e202c6446e 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -48,61 +48,61 @@ struct FormatEntry const char* human_presentable_name, const char* native_format_name, 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; - OUString aNativeFormatName; - sal_Int32 aStandardFormatId; + css::datatransfer::DataFlavor aDataFlavor; + OUString aNativeFormatName; + sal_Int32 aStandardFormatId; }; // CDataFormatTranslator class CDataFormatTranslator : public - cppu::WeakImplHelper< com::sun::star::datatransfer::XDataFormatTranslator, \ - com::sun::star::lang::XServiceInfo > + cppu::WeakImplHelper< css::datatransfer::XDataFormatTranslator, + css::lang::XServiceInfo > { public: - CDataFormatTranslator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + CDataFormatTranslator( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XDataFormatTranslator - virtual ::com::sun::star::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const ::com::sun::star::datatransfer::DataFlavor& aDataFlavor ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) + throw(css::uno::RuntimeException); - virtual ::com::sun::star::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const ::com::sun::star::uno::Any& aSysDataType ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const css::uno::Any& aSysDataType ) + throw(css::uno::RuntimeException); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); 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( ) - throw(::com::sun::star::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException); private: void SAL_CALL initTranslationTable( ); - void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; - void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; - void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, com::sun::star::uno::Any& aAny ) const; - void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) const; + void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, css::datatransfer::DataFlavor& aDataFlavor ) const; + void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, css::datatransfer::DataFlavor& aDataFlavor ) const; + void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, css::uno::Any& aAny ) const; + void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, css::uno::Any& aAny ) const; void SAL_CALL findStdFormatIdOrNativeFormatNameForFullMediaType( - const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory, - const OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const; + const css::uno::Reference< css::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory, + const OUString& aFullMediaType, css::uno::Any& aAny ) 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: - std::vector< FormatEntry > m_TranslTable; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + std::vector< FormatEntry > m_TranslTable; + const css::uno::Reference< css::uno::XComponentContext > m_xContext; }; #endif |