diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /filter/source/xmlfilteradaptor | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'filter/source/xmlfilteradaptor')
-rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 5 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 18 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/streamwrap.cxx | 2 |
3 files changed, 12 insertions, 13 deletions
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 7065dce019f2..a11fcffadc17 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -63,7 +63,6 @@ using namespace com::sun::star::xml::sax; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; -using ::rtl::OUString; #define MAP_LEN(x) x, sizeof(x) - 1 @@ -196,7 +195,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star if (xStatusIndicator.is()) xStatusIndicator->end(); - OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); return sal_False; } if (xStatusIndicator.is()) { @@ -315,7 +314,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star catch( const Exception& ) #endif { - OSL_FAIL( ::rtl::OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); if (xStatusIndicator.is()) xStatusIndicator->end(); return sal_False; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index f68722f8f120..68df79320d91 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -64,11 +64,11 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::rtl::OUString msFilterName; + OUString msFilterName; - ::com::sun::star::uno::Sequence< ::rtl::OUString > msUserData; + ::com::sun::star::uno::Sequence< OUString > msUserData; - ::rtl::OUString msTemplateName; + OUString msTemplateName; FilterType meType; @@ -130,15 +130,15 @@ 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); @@ -146,19 +146,19 @@ public: -::rtl::OUString XmlFilterAdaptor_getImplementationName() +OUString XmlFilterAdaptor_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index 66778325ddf0..d3115ca5cd2f 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -39,7 +39,7 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 rStream.write(aData.getConstArray(),aData.getLength(),nWritten); if (nWritten != (sal_uInt64)aData.getLength()) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); } } |