diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-11 14:59:25 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-12 19:53:52 +0000 |
commit | ea407568570d301888a0a51712356379d7b695d6 (patch) | |
tree | 9040f11712c1eac437551a2d81a0713eb420d7fe /dtrans/source/win32/ftransl | |
parent | 47283424b1df542b4894a164bc895858427d1a62 (diff) |
dtrans: com::sun::star->css
Change-Id: I4625a9b73c517b8187e03b11cc0546abdf338d8b
Reviewed-on: https://gerrit.libreoffice.org/18502
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dtrans/source/win32/ftransl')
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 6 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.hxx | 48 |
2 files changed, 27 insertions, 27 deletions
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 |