diff options
Diffstat (limited to 'dtrans/source/win32/ftransl')
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 15 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.hxx | 20 |
2 files changed, 17 insertions, 18 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 1f141f2faf56..70724c1600a8 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -39,19 +39,18 @@ #define MODULE_PRIVATE #define CPPUTYPE_SEQSALINT8 getCppuType( (const Sequence< sal_Int8 >*) 0 ) #define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8 -#define CPPUTYPE_OUSTR getCppuType( (const ::rtl::OUString*) 0 ) +#define CPPUTYPE_OUSTR getCppuType( (const OUString*) 0 ) #define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 ) #define EMPTY_OUSTR OUString() -const rtl::OUString Windows_FormatName ("windows_formatname"); +const OUString Windows_FormatName ("windows_formatname"); const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0); -const com::sun::star::uno::Type CppuType_String = ::getCppuType((const ::rtl::OUString*)0); +const com::sun::star::uno::Type CppuType_String = ::getCppuType((const OUString*)0); //------------------------------------------------------------------------ // namespace directives //------------------------------------------------------------------------ -using ::rtl::OUString; using namespace osl; using namespace cppu; using namespace std; @@ -93,14 +92,14 @@ FormatEntry::FormatEntry( CLIPFORMAT std_clipboard_format_id, ::com::sun::star::uno::Type const & cppu_type) { - aDataFlavor.MimeType = rtl::OUString::createFromAscii(mime_content_type); - aDataFlavor.HumanPresentableName = rtl::OUString::createFromAscii(human_presentable_name); + aDataFlavor.MimeType = OUString::createFromAscii(mime_content_type); + aDataFlavor.HumanPresentableName = OUString::createFromAscii(human_presentable_name); aDataFlavor.DataType = cppu_type; if (native_format_name) - aNativeFormatName = rtl::OUString::createFromAscii(native_format_name); + aNativeFormatName = OUString::createFromAscii(native_format_name); else - aNativeFormatName = rtl::OUString::createFromAscii(human_presentable_name); + aNativeFormatName = OUString::createFromAscii(human_presentable_name); aStandardFormatId = std_clipboard_format_id; } diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 4650fc06cd1c..8340050dafff 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -53,7 +53,7 @@ struct FormatEntry ); com::sun::star::datatransfer::DataFlavor aDataFlavor; - rtl::OUString aNativeFormatName; + OUString aNativeFormatName; sal_Int32 aStandardFormatId; }; @@ -83,29 +83,29 @@ public: // XServiceInfo //------------------------------------------------ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::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 rtl::OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const; - void SAL_CALL findStandardFormatIdForCharset( const rtl::OUString& aCharset, com::sun::star::uno::Any& aAny ) const; - void SAL_CALL setStandardFormatIdForNativeFormatName( const rtl::OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) 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 findStdFormatIdOrNativeFormatNameForFullMediaType( const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory, - const rtl::OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const; + const OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const; - sal_Bool isTextPlainMediaType( const rtl::OUString& fullMediaType ) const; + sal_Bool isTextPlainMediaType( const OUString& fullMediaType ) const; - com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const rtl::OUString& cnttype, const rtl::OUString& hpname, ::com::sun::star::uno::Type dtype ); + com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, ::com::sun::star::uno::Type dtype ); private: std::vector< FormatEntry > m_TranslTable; |