diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
| commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
| tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 | |
| parent | 4e729de73f2947155248f8df5897380611b87917 (diff) | |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
450 files changed, 4445 insertions, 4575 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 71c4b0ff4892..d869f865fbc0 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -123,7 +123,7 @@ public: bool IsInDropDown(); void HandleDropOpen(); void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList); - void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList); + void UpdateSelection_Acc (const OUString& sTextOfSelectedItem, bool b_IsDropDownList); void UpdateSelection_Impl_Acc (bool b_IsDropDownList); static void NotifyListItem(css::uno::Any const & val); diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index 7a7bb6f74b8f..958e73470611 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -71,7 +71,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; // XAccessibleAction - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index a8826487d664..228924042108 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -70,7 +70,7 @@ public: virtual css::uno::Any SAL_CALL getMinimumValue( ) override; // XAccessibleContext - ::rtl::OUString SAL_CALL getAccessibleName( ) override; + OUString SAL_CALL getAccessibleName( ) override; }; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 1fd7ccc5cb6e..bcc805ddb0fc 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -173,7 +173,7 @@ void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) } } -void VCLXAccessibleList::UpdateSelection_Acc (const ::rtl::OUString& /*sTextOfSelectedItem*/, bool b_IsDropDownList) +void VCLXAccessibleList::UpdateSelection_Acc (const OUString& /*sTextOfSelectedItem*/, bool b_IsDropDownList) { if ( m_aBoxType == COMBOBOX ) { diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx index 9d9d436b042a..2bcd5011497c 100644 --- a/avmedia/source/macavf/framegrabber.hxx +++ b/avmedia/source/macavf/framegrabber.hxx @@ -41,9 +41,9 @@ public: virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index fc9ef1e1cdaf..f6872e30c317 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -86,17 +86,17 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe } -::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( ) +OUString SAL_CALL FrameGrabber::getImplementationName( ) { - return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ); + return OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ); } -sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) { return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME; } -uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) { return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME }; } diff --git a/avmedia/source/macavf/macavfuno.mm b/avmedia/source/macavf/macavfuno.mm index c10ad73d22dd..60435b8337a3 100644 --- a/avmedia/source/macavf/macavfuno.mm +++ b/avmedia/source/macavf/macavfuno.mm @@ -35,12 +35,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* avmediaMacAVF_component_getFactory( const if( rtl_str_compare( pImplName, AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) == 0 ) { - const ::rtl::OUString aServiceName( AVMEDIA_MACAVF_MANAGER_SERVICENAME ); + const OUString aServiceName( AVMEDIA_MACAVF_MANAGER_SERVICENAME ); xFactory.set( ::cppu::createSingleFactory( static_cast< lang::XMultiServiceFactory* >( pServiceManager ), AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME, - create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) ); + create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) ); } if( xFactory.is() ) diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx index e20385725988..9f8f6da2f59d 100644 --- a/avmedia/source/macavf/manager.hxx +++ b/avmedia/source/macavf/manager.hxx @@ -37,12 +37,12 @@ public: virtual ~Manager() override; // XManager - virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) override; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 69d2a3c0196f..a932549ea618 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -36,7 +36,7 @@ Manager::~Manager() {} -uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL ) +uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) { Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -49,19 +49,19 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU } -::rtl::OUString SAL_CALL Manager::getImplementationName( ) +OUString SAL_CALL Manager::getImplementationName( ) { - return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ); + return OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ); } -sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) { return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME; } -uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) { return { AVMEDIA_MACAVF_MANAGER_SERVICENAME }; } diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx index 47a62aa56971..99b79b843459 100644 --- a/avmedia/source/macavf/player.hxx +++ b/avmedia/source/macavf/player.hxx @@ -37,7 +37,7 @@ public: explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); virtual ~Player() override; - bool create( const ::rtl::OUString& rURL ); + bool create( const OUString& rURL ); bool create( AVAsset* ); // XPlayer @@ -61,9 +61,9 @@ public: virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; AVPlayer* getAVPlayer() const { return mpPlayer; } virtual bool handleObservation( NSString* pKeyPath ) override; diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index 1d51ca276474..ea7e48711861 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -108,7 +108,7 @@ bool Player::handleObservation( NSString* pKeyPath ) } -bool Player::create( const ::rtl::OUString& rURL ) +bool Player::create( const OUString& rURL ) { // get the media asset NSString* aNSStr = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(rURL.getStr()) length:rURL.getLength()]; @@ -342,19 +342,19 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() } -::rtl::OUString SAL_CALL Player::getImplementationName( ) +OUString SAL_CALL Player::getImplementationName( ) { - return ::rtl::OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME ); + return OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME ); } -sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) { return ServiceName == AVMEDIA_MACAVF_PLAYER_SERVICENAME; } -uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( ) { return { AVMEDIA_MACAVF_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx index 709f35371772..d8d1f71b3772 100644 --- a/avmedia/source/macavf/window.hxx +++ b/avmedia/source/macavf/window.hxx @@ -85,9 +85,9 @@ public: virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; virtual bool handleObservation( NSString* pKeyPath ) override; diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm index 46f9c4c50669..ebd6065df450 100644 --- a/avmedia/source/macavf/window.mm +++ b/avmedia/source/macavf/window.mm @@ -239,19 +239,19 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis // XServiceInfo -::rtl::OUString SAL_CALL Window::getImplementationName( ) +OUString SAL_CALL Window::getImplementationName( ) { - return ::rtl::OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME ); + return OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME ); } -sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) { return ServiceName == AVMEDIA_MACAVF_WINDOW_SERVICENAME; } -uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) { return { AVMEDIA_MACAVF_WINDOW_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 99b08060b3c4..23cbe6c4730a 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -43,8 +43,8 @@ namespace vlc { namespace { - const ::rtl::OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC"; - const ::rtl::OUString AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC"; + const OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC"; + const OUString AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC"; const int MSEC_IN_SEC = 1000; const char * const VLC_ARGS[] = { @@ -58,7 +58,7 @@ namespace }; } -VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url ) +VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const OUString& url ) : FrameGrabber_BASE() , mInstance( SAL_N_ELEMENTS(VLC_ARGS), VLC_ARGS ) , mMedia( url, mInstance ) @@ -71,7 +71,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString { osl::Condition condition; - const rtl::OUString& fileName = utl::TempFile::CreateTempName(); + const OUString& fileName = utl::TempFile::CreateTempName(); { wrapper::EventManager manager( mPlayer, mEventHandler ); manager.onPaused([&condition](){ condition.set(); }); @@ -100,7 +100,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString manager.onPaused(); } - rtl::OUString url; + OUString url; osl::FileBase::getFileURLFromSystemPath( fileName, url ); std::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url, StreamMode::STD_READ ) ); @@ -112,17 +112,17 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString return Graphic( bitmap ).GetXGraphic(); } -::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() +OUString SAL_CALL VLCFrameGrabber::getImplementationName() { return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME; } -sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) +sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const OUString& serviceName ) { return cppu::supportsService(this, serviceName); } -::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() +::uno::Sequence< OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() { return { AVMEDIA_VLC_GRABBER_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index 02853c8fda5d..5599f3689f6d 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -38,13 +38,13 @@ class VLCFrameGrabber : public FrameGrabber_BASE wrapper::Player mPlayer; wrapper::EventHandler& mEventHandler; public: - VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url ); + VLCFrameGrabber( wrapper::EventHandler& eh, const OUString& url ); css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; - ::rtl::OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override; - css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 0b61eeb7d3f7..e82e88b604aa 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -27,8 +27,8 @@ namespace vlc { namespace { - const rtl::OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC"; - const ::rtl::OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC"; + const OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC"; + const OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC"; const char * const VLC_ARGS[] = { "--demux", @@ -82,7 +82,7 @@ Manager::~Manager() mEventHandler.stop(); } -uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL ) +uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) { if ( !m_is_vlc_found ) throw uno::RuntimeException("VLC not found", nullptr); @@ -105,17 +105,17 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt return mPlayer; } -rtl::OUString SAL_CALL Manager::getImplementationName() +OUString SAL_CALL Manager::getImplementationName() { return VLC_IMPLEMENTATION_NAME; } -sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName ) +sal_Bool SAL_CALL Manager::supportsService( const OUString& serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames() { return { VLC_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index 5b83cea984e0..478a2e9d664d 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -37,15 +37,15 @@ public: explicit Manager(); virtual ~Manager() override; - css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) override; + css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override; - rtl::OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) override; - css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: css::uno::Reference< css::media::XPlayer > mPlayer; - rtl::OUString mURL; + OUString mURL; bool m_is_vlc_found; }; diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index a36064030921..0382b3e1c57c 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -33,13 +33,13 @@ namespace vlc { namespace { - const ::rtl::OUString AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC"; - const ::rtl::OUString AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC"; + const OUString AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC"; + const OUString AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC"; const int MS_IN_SEC = 1000; // Millisec in sec } -VLCPlayer::VLCPlayer( const rtl::OUString& url, +VLCPlayer::VLCPlayer( const OUString& url, wrapper::Instance& instance, wrapper::EventHandler& eh ) : VLC_Base( m_aMutex ) @@ -232,17 +232,17 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb return mrFrameGrabber; } -::rtl::OUString SAL_CALL VLCPlayer::getImplementationName() +OUString SAL_CALL VLCPlayer::getImplementationName() { return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME; } -sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ) +sal_Bool SAL_CALL VLCPlayer::supportsService( const OUString& serviceName ) { return cppu::supportsService(this, serviceName); } -::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() +::uno::Sequence< OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() { return { AVMEDIA_VLC_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index 8e5298175bc8..c5248707d044 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -44,12 +44,12 @@ class VLCPlayer : public ::cppu::BaseMutex, wrapper::Media mMedia; wrapper::Player mPlayer; wrapper::EventManager mEventManager; - const rtl::OUString mUrl; + const OUString mUrl; bool mPlaybackLoop; css::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber; intptr_t mPrevWinID; public: - VLCPlayer( const rtl::OUString& url, + VLCPlayer( const OUString& url, wrapper::Instance& instance, wrapper::EventHandler& eh ); @@ -73,9 +73,9 @@ public: css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override; - ::rtl::OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override; - css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: void replay(); diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 1887f3ee1424..36894d1f74e8 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -29,8 +29,8 @@ namespace vlc { namespace { - const ::rtl::OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC"; - const ::rtl::OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC"; + const OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC"; + const OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC"; } VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID ) @@ -93,17 +93,17 @@ void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) { } -::rtl::OUString SAL_CALL VLCWindow::getImplementationName() +OUString SAL_CALL VLCWindow::getImplementationName() { return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME; } -sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) +sal_Bool SAL_CALL VLCWindow::supportsService( const OUString& serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL VLCWindow::getSupportedServiceNames() { return { AVMEDIA_VLC_WINDOW_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index eaab56d718d2..df0530035412 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -42,9 +42,9 @@ public: css::media::ZoomLevel SAL_CALL getZoomLevel() override; void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) override; - ::rtl::OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override; - css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void SAL_CALL dispose() override; void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx index d884180bbd9d..c6c74420ab53 100644 --- a/avmedia/source/vlc/wrapper/Media.cxx +++ b/avmedia/source/vlc/wrapper/Media.cxx @@ -35,9 +35,9 @@ namespace char* ( *libvlc_media_get_mrl )(libvlc_media_t *p_md); - libvlc_media_t* InitMedia( const rtl::OUString& url, Instance& instance ) + libvlc_media_t* InitMedia( const OUString& url, Instance& instance ) { - rtl::OString dest; + OString dest; url.convertToString(&dest, RTL_TEXTENCODING_UTF8, 0); return libvlc_media_new_location(instance, dest.getStr()); @@ -61,7 +61,7 @@ bool Media::LoadSymbols() return InitApiMap( VLC_MEDIA_API ); } -Media::Media( const rtl::OUString& url, Instance& instance ) +Media::Media( const OUString& url, Instance& instance ) : mMedia( InitMedia( url, instance ) ) { if (mMedia == nullptr) diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx index 108ec02d2100..2f8e0d8903a0 100644 --- a/avmedia/source/vlc/wrapper/Player.cxx +++ b/avmedia/source/vlc/wrapper/Player.cxx @@ -229,9 +229,9 @@ namespace wrapper #endif } - void Player::takeSnapshot( const rtl::OUString& file ) + void Player::takeSnapshot( const OUString& file ) { - rtl::OString dest; + OString dest; file.convertToString( &dest, RTL_TEXTENCODING_UTF8, 0 ); libvlc_video_take_snapshot( mPlayer, 0, dest.getStr(), 480, 360 ); } diff --git a/basegfx/source/tools/numbertools.cxx b/basegfx/source/tools/numbertools.cxx index c4bf5792cfb5..73faf5c60e75 100644 --- a/basegfx/source/tools/numbertools.cxx +++ b/basegfx/source/tools/numbertools.cxx @@ -27,7 +27,7 @@ namespace basegfx { namespace utils // } // config here - rtl::OStringBuffer aNum; + OStringBuffer aNum; rtl::math::doubleToStringBuffer(aNum, fValue, rtl_math_StringFormat_F, diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 05ce540be4b1..fc7d149191ac 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -593,7 +593,7 @@ void SbRtl_MkDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) pPar->Insert( pParam.get(), pPar->Count() ); SbRtl_CurDir( pBasic, *pPar, bWrite ); - rtl::OUString sCurPathURL; + OUString sCurPathURL; File::getFileURLFromSystemPath( pPar->Get(0)->GetOUString(), sCurPathURL ); aURLObj.SetURL( sCurPathURL ); diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index f415f792809d..ed2de8179748 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -138,9 +138,9 @@ namespace oglcanvas return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll); } - ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { - return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME ); + return OUString( SPRITECANVAS_SERVICE_NAME ); } void SpriteCanvas::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite ) diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 2ab985143dc8..ae6697cc85e2 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -96,7 +96,7 @@ namespace oglcanvas virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) override; + virtual OUString SAL_CALL getServiceName( ) override; void show( const ::rtl::Reference< CanvasCustomSprite >& ); void hide( const ::rtl::Reference< CanvasCustomSprite >& ); diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 19ce79f8fad7..014ce5d0a924 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -39,7 +39,6 @@ #include "ChartLinePanel.hxx" using namespace css::uno; -using ::rtl::OUString; namespace chart { namespace sidebar { @@ -53,7 +52,7 @@ ChartPanelFactory::~ChartPanelFactory() } Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) { Reference<css::ui::XUIElement> xElement; diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx index 4a1b043c1130..a3292525e6ff 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx @@ -44,7 +44,7 @@ public: // XUIElementFactory virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; virtual OUString SAL_CALL getImplementationName() override; diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 7427b280edd5..9221c750f645 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -79,8 +79,8 @@ void PropertyMapper::getValueMap( uno::Reference< beans::XMultiPropertySet > xMultiPropSet(xSourceProp, uno::UNO_QUERY); if((false) && xMultiPropSet.is()) { - uno::Sequence< rtl::OUString > aPropSourceNames(rNameMap.size()); - uno::Sequence< rtl::OUString > aPropTargetNames(rNameMap.size()); + uno::Sequence< OUString > aPropSourceNames(rNameMap.size()); + uno::Sequence< OUString > aPropTargetNames(rNameMap.size()); sal_Int32 i = 0; for (auto const& elem : rNameMap) { diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index 8fa60ab6776f..b6c2aeee6f87 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -33,7 +33,7 @@ using codemaker::ExceptionTree; using codemaker::ExceptionTreeNode; -ExceptionTreeNode * ExceptionTreeNode::add(rtl::OString const & theName) { +ExceptionTreeNode * ExceptionTreeNode::add(OString const & theName) { std::unique_ptr< ExceptionTreeNode > node(new ExceptionTreeNode(theName)); children.push_back(std::move(node)); return children.back().get(); @@ -44,11 +44,11 @@ void ExceptionTreeNode::clearChildren() { } void ExceptionTree::add( - rtl::OString const & name, rtl::Reference< TypeManager > const & manager) + OString const & name, rtl::Reference< TypeManager > const & manager) { - std::vector< rtl::OString > list; + std::vector< OString > list; bool bRuntimeException = false; - for (rtl::OString n(name); n != "com.sun.star.uno.Exception";) { + for (OString n(name); n != "com.sun.star.uno.Exception";) { if (n == "com.sun.star.uno.RuntimeException") { bRuntimeException = true; break; @@ -65,7 +65,7 @@ void ExceptionTree::add( } if (!bRuntimeException) { ExceptionTreeNode * node = &m_root; - for (std::vector< rtl::OString >::reverse_iterator i(list.rbegin()); + for (std::vector< OString >::reverse_iterator i(list.rbegin()); !node->present; ++i) { if (i == list.rend()) { diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 5b95332c1007..5005882bd765 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -333,30 +333,30 @@ FileStream &operator<<(FileStream& o, char const * s) { osl_writeFile(o.m_file, s, strlen(s), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, ::rtl::OString const * s) { +FileStream &operator<<(FileStream& o, OString const * s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, const ::rtl::OString& s) { +FileStream &operator<<(FileStream& o, const OString& s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer const * s) { +FileStream &operator<<(FileStream& o, OStringBuffer const * s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) { +FileStream &operator<<(FileStream& o, const OStringBuffer& s) { sal_uInt64 writtenBytes; osl_writeFile( o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream & operator <<(FileStream & out, rtl::OUString const & s) { +FileStream & operator <<(FileStream & out, OUString const & s) { return out << OUStringToOString(s, RTL_TEXTENCODING_UTF8); } diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 7a94b0956b75..9b8dbf61f6bf 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -20,8 +20,6 @@ #include <codemaker/options.hxx> -using ::rtl::OString; - Options::Options() { } diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 54bfec3393f9..d9077dc43d7e 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -24,8 +24,6 @@ #include <osl/thread.h> #include <osl/process.h> -using ::rtl::OString; - #ifdef SAL_UNX #define SEPARATOR '/' #else diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index cde5c68d2f93..91226c0165e2 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -30,7 +30,7 @@ class CppuOptions; class TypeManager; void produce( - rtl::OUString const & name, rtl::Reference< TypeManager > const & manager, + OUString const & name, rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, CppuOptions const & options); #endif diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx index 5e7adb442024..3143b4e40483 100644 --- a/codemaker/source/cppumaker/dependencies.hxx +++ b/codemaker/source/cppumaker/dependencies.hxx @@ -47,7 +47,7 @@ public: */ enum Kind { KIND_NORMAL, KIND_BASE, KIND_EXCEPTION }; - typedef std::map< rtl::OUString, Kind > Map; + typedef std::map< OUString, Kind > Map; /** Constructs the dependencies for a given entity. @@ -62,7 +62,7 @@ public: */ Dependencies( rtl::Reference< TypeManager > const & manager, - rtl::OUString const & name); + OUString const & name); ~Dependencies(); @@ -101,7 +101,7 @@ public: bool hasSequenceDependency() const { return m_sequenceDependency; } private: - void insert(rtl::OUString const & name, Kind kind); + void insert(OUString const & name, Kind kind); rtl::Reference< TypeManager > m_manager; Map m_map; diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx index a540e782bbd7..ec4a586c4a17 100644 --- a/codemaker/source/cppumaker/dumputils.cxx +++ b/codemaker/source/cppumaker/dumputils.cxx @@ -29,12 +29,12 @@ namespace codemaker { namespace cppumaker { bool dumpNamespaceOpen( - FileStream & out, rtl::OUString const & entityName, bool fullModuleType) + FileStream & out, OUString const & entityName, bool fullModuleType) { bool bOutput = false; bool bFirst = true; for (sal_Int32 i = 0; i >= 0;) { - rtl::OUString id(entityName.getToken(0, '.', i)); + OUString id(entityName.getToken(0, '.', i)); if (fullModuleType || i >= 0) { if (!bFirst) { out << " "; @@ -48,7 +48,7 @@ bool dumpNamespaceOpen( } bool dumpNamespaceClose( - FileStream & out, rtl::OUString const & entityName, bool fullModuleType) + FileStream & out, OUString const & entityName, bool fullModuleType) { bool bOutput = false; bool bFirst = true; @@ -69,7 +69,7 @@ bool dumpNamespaceClose( return bOutput; } -void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName) { +void dumpTypeIdentifier(FileStream & out, OUString const & entityName) { out << entityName.copy(entityName.lastIndexOf('.') + 1); } diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index b5ece143572e..9d683a53ce08 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -861,7 +861,7 @@ sal_uInt16 addFieldInit( OString name(codemaker::convertString(fieldName)); OUString nucleus; sal_Int32 rank; - std::vector< rtl::OUString > args; + std::vector< OUString > args; rtl::Reference< unoidl::Entity > ent; codemaker::UnoType::Sort sort = manager->decompose( fieldType, true, &nucleus, &rank, &args, &ent); diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx index 4aee28e9887c..9263ecee9676 100644 --- a/codemaker/source/javamaker/javatype.hxx +++ b/codemaker/source/javamaker/javatype.hxx @@ -30,7 +30,7 @@ class JavaOptions; class TypeManager; void produce( - rtl::OUString const & name, rtl::Reference< TypeManager > const & manager, + OUString const & name, rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions const & options); #endif diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index cd927faa2bb8..81e5064f34e2 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -311,7 +311,7 @@ EmbeddedObjectContainer::GetEmbeddedObject( uno::Reference<embed::XEmbeddedObject> EmbeddedObjectContainer::Get_Impl( const OUString& rName, const uno::Reference<embed::XEmbeddedObject>& xCopy, - rtl::OUString const*const pBaseURL) + OUString const*const pBaseURL) { uno::Reference < embed::XEmbeddedObject > xObj; try diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index ee3f336f7d15..8a107e891577 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -2210,9 +2210,9 @@ namespace comphelper /////////////////// helpers /////////////////////// - const rtl::OUString BackupFileHelper::getPackURL() + const OUString BackupFileHelper::getPackURL() { - return rtl::OUString(maUserConfigWorkURL + "/pack"); + return OUString(maUserConfigWorkURL + "/pack"); } /////////////////// file push helpers /////////////////////// diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 1458d0c0a4f6..6cf07d4795fb 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -262,11 +262,11 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( std::vector<unsigned char> DocPasswordHelper::GetOoxHashAsVector( - const rtl::OUString& rPassword, + const OUString& rPassword, const std::vector<unsigned char>& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName) + const OUString& rAlgorithmName) { comphelper::HashType eType; if (rAlgorithmName == "SHA-512" || rAlgorithmName == "SHA512") @@ -285,11 +285,11 @@ std::vector<unsigned char> DocPasswordHelper::GetOoxHashAsVector( css::uno::Sequence<sal_Int8> DocPasswordHelper::GetOoxHashAsSequence( - const rtl::OUString& rPassword, - const rtl::OUString& rSaltValue, + const OUString& rPassword, + const OUString& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName) + const OUString& rAlgorithmName) { std::vector<unsigned char> aSaltVec; if (!rSaltValue.isEmpty()) @@ -305,11 +305,11 @@ css::uno::Sequence<sal_Int8> DocPasswordHelper::GetOoxHashAsSequence( } OUString DocPasswordHelper::GetOoxHashAsBase64( - const rtl::OUString& rPassword, - const rtl::OUString& rSaltValue, + const OUString& rPassword, + const OUString& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName) + const OUString& rAlgorithmName) { css::uno::Sequence<sal_Int8> aSeq( GetOoxHashAsSequence( rPassword, rSaltValue, nSpinCount, eIterCount, rAlgorithmName)); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 4c797105ce4f..1a7ebd8bde0d 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -129,17 +129,17 @@ namespace comphelper // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) override + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override { OPropertyBag_PBase::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) override + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override { return OPropertyBag_PBase::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); } // XSet diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index ffb1287b82da..b3592bb1a8af 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -392,7 +392,7 @@ void writeNode( } // helpers to allow sorting of configmgr::Modifications::Node -typedef std::pair< const rtl::OUString, configmgr::Modifications::Node > ModNodePairEntry; +typedef std::pair< const OUString, configmgr::Modifications::Node > ModNodePairEntry; struct PairEntrySorter { bool operator() (const ModNodePairEntry* pValue1, const ModNodePairEntry* pValue2) const diff --git a/connectivity/source/drivers/firebird/Clob.hxx b/connectivity/source/drivers/firebird/Clob.hxx index 738b0ce86c64..626b284d3785 100644 --- a/connectivity/source/drivers/firebird/Clob.hxx +++ b/connectivity/source/drivers/firebird/Clob.hxx @@ -48,12 +48,12 @@ namespace connectivity // ---- XClob ---------------------------------------------------- virtual sal_Int64 SAL_CALL length() override; - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getSubString(sal_Int64 aPosition, sal_Int32 aLength) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream() override; virtual sal_Int64 SAL_CALL - position(const ::rtl::OUString& rPattern, + position(const OUString& rPattern, sal_Int32 aStart) override; virtual sal_Int64 SAL_CALL positionOfClob(const ::css::uno::Reference< ::css::sdbc::XClob >& rPattern, diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 04c4cb821daa..b7f1276a8d4f 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -123,7 +123,7 @@ struct ConnectionGuard } }; -void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) +void Connection::construct(const OUString& url, const Sequence< PropertyValue >& info) { ConnectionGuard aGuard(m_refCount); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 6992a5dedd1f..f1d4f7dd8003 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -75,13 +75,13 @@ namespace connectivity // DatabaseMetaData.getTypeInfo. /** The URL passed to us when opening, i.e. of the form sdbc:* */ - ::rtl::OUString m_sConnectionURL; + OUString m_sConnectionURL; /** * The URL passed to firebird, i.e. either a local file (for a * temporary .fdb extracted from a .odb or a normal local file) or * a remote url. */ - ::rtl::OUString m_sFirebirdURL; + OUString m_sFirebirdURL; /* EMBEDDED MODE DATA */ /** Denotes that we have a database stored within a .odb file. */ @@ -117,7 +117,7 @@ namespace connectivity * * (The temporary .fdb is our m_sFirebirdURL.) */ - ::rtl::OUString m_sFBKPath; + OUString m_sFBKPath; void loadDatabaseFile(const OUString& pSrcLocation, const OUString& pTmpLocation); @@ -169,7 +169,7 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void construct( const ::rtl::OUString& url, + void construct( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info); const OUString& getConnectionURL() const {return m_sConnectionURL;} @@ -217,9 +217,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) override; - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; virtual sal_Bool SAL_CALL getAutoCommit( ) override; virtual void SAL_CALL commit( ) override; @@ -228,8 +228,8 @@ namespace connectivity virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; virtual sal_Bool SAL_CALL isReadOnly( ) override; - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) override; - virtual ::rtl::OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index aeb7acab00d9..dc55940fcfe5 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -47,17 +47,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; - virtual ::rtl::OUString SAL_CALL getURL( ) override; - virtual ::rtl::OUString SAL_CALL getUserName( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; virtual sal_Bool SAL_CALL isReadOnly( ) override; virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) override; - virtual ::rtl::OUString SAL_CALL getDriverName( ) override; - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; virtual sal_Bool SAL_CALL usesLocalFiles( ) override; @@ -70,14 +70,14 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) override; - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) override; - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) override; - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; @@ -105,11 +105,11 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) override; - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) override; - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; @@ -163,23 +163,23 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; @@ -192,7 +192,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 87dd693efc88..199529016995 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -136,9 +136,9 @@ void FirebirdDriver::disposing() } //----- static ServiceInfo --------------------------------------------------- -rtl::OUString FirebirdDriver::getImplementationName_Static() +OUString FirebirdDriver::getImplementationName_Static() { - return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver"); + return OUString("com.sun.star.comp.sdbc.firebird.Driver"); } Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 7394f6ad238f..8fcf17fa2665 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -68,19 +68,19 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface /// @throws css::uno::RuntimeException - static ::rtl::OUString getImplementationName_Static( ); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; virtual sal_Int32 SAL_CALL getMajorVersion( ) override; virtual sal_Int32 SAL_CALL getMinorVersion( ) override; diff --git a/connectivity/source/drivers/firebird/Indexes.hxx b/connectivity/source/drivers/firebird/Indexes.hxx index 236a0ff064ae..364b36b04278 100644 --- a/connectivity/source/drivers/firebird/Indexes.hxx +++ b/connectivity/source/drivers/firebird/Indexes.hxx @@ -30,11 +30,11 @@ namespace connectivity protected: // XDrop virtual void dropObject(sal_Int32 nPosition, - const ::rtl::OUString& sIndexName) override; + const OUString& sIndexName) override; public: Indexes(Table* pTable, ::osl::Mutex& rMutex, - const std::vector< ::rtl::OUString>& rVector); + const std::vector< OUString>& rVector); }; } // namespace firebird diff --git a/connectivity/source/drivers/firebird/Keys.hxx b/connectivity/source/drivers/firebird/Keys.hxx index b712ab4122f7..143dbbf5486b 100644 --- a/connectivity/source/drivers/firebird/Keys.hxx +++ b/connectivity/source/drivers/firebird/Keys.hxx @@ -31,7 +31,7 @@ namespace connectivity const ::std::vector< OUString>& rNames); // OKeysHelper / XDrop - void dropObject(sal_Int32 nPosition, const ::rtl::OUString& sName) override; + void dropObject(sal_Int32 nPosition, const OUString& sName) override; }; } diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index acb99c8abb99..bec7fdfe02a8 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -766,7 +766,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, const ::rtl::OUString& ) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index 19f19d423c7b..63800ac09e01 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -48,7 +48,7 @@ namespace connectivity public OPreparedStatement_Base { protected: - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; XSQLDA* m_pOutSqlda; @@ -88,7 +88,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // a constructor, which is required for returning objects: OPreparedStatement( Connection* _pConnection, - const ::rtl::OUString& sql); + const OUString& sql); //XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; @@ -109,7 +109,7 @@ namespace connectivity // XParameters virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) override; virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) override; virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) override; @@ -117,7 +117,7 @@ namespace connectivity virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) override; virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index f6aac2e1dc1f..008bc5b55263 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -155,7 +155,7 @@ namespace connectivity virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow virtual sal_Bool SAL_CALL wasNull( ) override; - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; @@ -183,7 +183,7 @@ namespace connectivity // XWarningsSupplier // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override; + virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) override; }; @@ -208,7 +208,7 @@ namespace connectivity OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); - template <> ::rtl::OUString + template <> OUString OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index 1b134a0628fd..1c6d1ca22fc1 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -62,19 +62,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) override; virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnName(sal_Int32 column) override; + virtual OUString SAL_CALL getSchemaName(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; + virtual OUString SAL_CALL getTableName(sal_Int32 column) override; + virtual OUString SAL_CALL getCatalogName(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override; virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) override; virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; }; } } diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 023a41dff18b..69b05e471263 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -24,7 +24,6 @@ #include <sal/types.h> using namespace connectivity::firebird; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index 248a2a65fb1a..56b1ae7edde5 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -58,15 +58,15 @@ namespace connectivity // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - executeQuery(const ::rtl::OUString& sql) override; - virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) override; + executeQuery(const OUString& sql) override; + virtual sal_Int32 SAL_CALL executeUpdate(const OUString& sqlIn) override; virtual sal_Bool SAL_CALL - execute(const ::rtl::OUString& sql) override; + execute(const OUString& sql) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() override; // XBatchExecution - UNSUPPORTED - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) override; + virtual void SAL_CALL addBatch( const OUString& sql ) override; virtual void SAL_CALL clearBatch( ) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override; diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index e0000f6f6e53..586152ecce10 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -33,7 +33,7 @@ namespace connectivity * Get the ALTER TABLE [TABLE] ALTER [COLUMN] String. * Includes a trailing space. */ - ::rtl::OUString getAlterTableColumn(const ::rtl::OUString& rColumn); + OUString getAlterTableColumn(const OUString& rColumn); protected: void construct() override; @@ -45,9 +45,9 @@ namespace connectivity Table(Tables* pTables, ::osl::Mutex& rMutex, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& rName, - const ::rtl::OUString& rType, - const ::rtl::OUString& rDescription); + const OUString& rName, + const OUString& rType, + const OUString& rDescription); // OTableHelper virtual ::connectivity::sdbcx::OCollection* createColumns( @@ -63,11 +63,11 @@ namespace connectivity * rDescriptor. */ virtual void SAL_CALL alterColumnByName( - const ::rtl::OUString& rColName, + const OUString& rColName, const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override; // XRename -- UNSUPPORTED - virtual void SAL_CALL rename(const ::rtl::OUString& sName) override; + virtual void SAL_CALL rename(const OUString& sName) override; //XInterface virtual css::uno::Any diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index 5c2742659ce5..58b31a373468 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -34,7 +34,7 @@ namespace connectivity // OCollection virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( - const ::rtl::OUString& rName) override; + const OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual ::connectivity::sdbcx::ObjectType appendObject( @@ -51,7 +51,7 @@ namespace connectivity // XAppend, etc., but all are optional. // XDrop - virtual void dropObject(sal_Int32 nPosition, const ::rtl::OUString& rName) override; + virtual void dropObject(sal_Int32 nPosition, const OUString& rName) override; }; diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx index 8ff9155a14af..d2cc091000b9 100644 --- a/connectivity/source/drivers/firebird/User.hxx +++ b/connectivity/source/drivers/firebird/User.hxx @@ -31,7 +31,7 @@ namespace connectivity /** * For a user that already exists in the db. */ - User(const ::rtl::OUString& rName); + User(const OUString& rName); // IRefreshableGroups:: virtual void refreshGroups() override; diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index 8b307b5d1578..69cf571154cb 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -31,7 +31,7 @@ namespace connectivity // OCollection virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( - const ::rtl::OUString& rName) override; + const OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual ::connectivity::sdbcx::ObjectType appendObject( @@ -48,7 +48,7 @@ namespace connectivity // XAppend, etc., but all are optional. // XDrop - virtual void dropObject(sal_Int32 nPosition, const ::rtl::OUString& rName) override; + virtual void dropObject(sal_Int32 nPosition, const OUString& rName) override; }; diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index dbff25356205..26929a9de162 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -66,7 +66,7 @@ public: OUString const & getCharacterSet() const { return m_sCharsetName; } sal_Int32 getSdbcType() const; - ::rtl::OUString getColumnTypeName() const; + OUString getColumnTypeName() const; }; @@ -96,7 +96,7 @@ public: * @throws css::sdbc::SQLException */ void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, - const ::rtl::OUString& aCause, + const OUString& aCause, const css::uno::Reference< css::uno::XInterface >& _rxContext); /** diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx index e6149975be9c..cb1b06261042 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx @@ -55,7 +55,7 @@ using ::osl::MutexGuard; namespace { -void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql) +void lcl_executeUpdate(MYSQL* pMySql, const OString& sql) { mysql_real_query(pMySql, sql.getStr(), sql.getLength()); // TODO handle error @@ -78,7 +78,7 @@ OConnection::~OConnection() } } -void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyValue>& info) +void OConnection::construct(const OUString& url, const Sequence<PropertyValue>& info) { MutexGuard aGuard(m_aMutex); @@ -90,10 +90,10 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal mysql_options(&m_mysql, MYSQL_OPT_PROTOCOL, &protocol); sal_Int32 nIndex; - rtl::OUString token; - rtl::OUString aHostName("localhost"); + OUString token; + OUString aHostName("localhost"); sal_Int32 nPort = 3306; - rtl::OUString aDbName; + OUString aDbName; m_settings.encoding = MysqlCDriver::getDefaultEncoding(); @@ -114,7 +114,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal if (!token.isEmpty()) { sal_Int32 nIndex1 = 0; - rtl::OUString hostandport = token.getToken(0, ':', nIndex1); + OUString hostandport = token.getToken(0, ':', nIndex1); if (!hostandport.isEmpty()) { aHostName = hostandport; @@ -134,7 +134,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal // get user and password for mysql connection const PropertyValue* pIter = info.getConstArray(); const PropertyValue* pEnd = pIter + info.getLength(); - rtl::OUString aUser, aPass, sUnixSocket, sNamedPipe; + OUString aUser, aPass, sUnixSocket, sNamedPipe; bool unixSocketPassed = false; bool namedPipePassed = false; @@ -169,18 +169,18 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal } } - rtl::OString host_str = rtl::OUStringToOString(aHostName, m_settings.encoding); - rtl::OString user_str = rtl::OUStringToOString(aUser, m_settings.encoding); - rtl::OString pass_str = rtl::OUStringToOString(aPass, m_settings.encoding); - rtl::OString schema_str = rtl::OUStringToOString(aDbName, m_settings.encoding); - rtl::OString socket_str; + OString host_str = OUStringToOString(aHostName, m_settings.encoding); + OString user_str = OUStringToOString(aUser, m_settings.encoding); + OString pass_str = OUStringToOString(aPass, m_settings.encoding); + OString schema_str = OUStringToOString(aDbName, m_settings.encoding); + OString socket_str; if (unixSocketPassed) { - socket_str = rtl::OUStringToOString(sUnixSocket, m_settings.encoding); + socket_str = OUStringToOString(sUnixSocket, m_settings.encoding); } else if (namedPipePassed) { - socket_str = rtl::OUStringToOString(sNamedPipe, m_settings.encoding); + socket_str = OUStringToOString(sNamedPipe, m_settings.encoding); } // flags can also be passed as last parameter @@ -195,26 +195,26 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal if (getMysqlVersion() < 40100) { throw SQLException("MariaDB LibreOffice Connector requires MySQL Server 4.1 or above", - *this, rtl::OUString(), 0, Any()); + *this, OUString(), 0, Any()); } - lcl_executeUpdate(&m_mysql, rtl::OString{ "SET session sql_mode='ANSI_QUOTES'" }); - lcl_executeUpdate(&m_mysql, rtl::OString{ "SET NAMES utf8" }); + lcl_executeUpdate(&m_mysql, OString{ "SET session sql_mode='ANSI_QUOTES'" }); + lcl_executeUpdate(&m_mysql, OString{ "SET NAMES utf8" }); } -rtl::OUString OConnection::getImplementationName() +OUString OConnection::getImplementationName() { - return rtl::OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection"); + return OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection"); } -css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames() +css::uno::Sequence<OUString> OConnection::getSupportedServiceNames() { - css::uno::Sequence<rtl::OUString> s(1); + css::uno::Sequence<OUString> s(1); s[0] = "com.sun.star.sdbc.Connection"; return s; } -sal_Bool OConnection::supportsService(rtl::OUString const& ServiceName) +sal_Bool OConnection::supportsService(OUString const& ServiceName) { return cppu::supportsService(this, ServiceName); } @@ -233,12 +233,12 @@ Reference<XStatement> SAL_CALL OConnection::createStatement() return xReturn; } -Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql) +Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const OUString& _sSql) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - const rtl::OString sSqlStatement - = rtl::OUStringToOString(_sSql, getConnectionEncoding()); // FIXME transform statement ? + const OString sSqlStatement + = OUStringToOString(_sSql, getConnectionEncoding()); // FIXME transform statement ? MYSQL_STMT* pStmt = mysql_stmt_init(&m_mysql); mysql_stmt_prepare(pStmt, sSqlStatement.getStr(), sSqlStatement.getLength()); @@ -254,7 +254,7 @@ Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const rtl:: return xStatement; } -Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/) +Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const OUString& /*_sSql*/) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -263,12 +263,12 @@ Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const rtl::OUStr return Reference<XPreparedStatement>(); } -rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& /*_sSql*/) +OUString SAL_CALL OConnection::nativeSQL(const OUString& /*_sSql*/) { MutexGuard aGuard(m_aMutex); - // const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql ); - rtl::OUString sNativeSQL; + // const OUString sSqlStatement = transFormPreparedStatement( _sSql ); + OUString sNativeSQL; // TODO return sNativeSQL; } @@ -355,7 +355,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly() return m_settings.readOnly; } -void SAL_CALL OConnection::setCatalog(const rtl::OUString& /*catalog*/) +void SAL_CALL OConnection::setCatalog(const OUString& /*catalog*/) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -363,7 +363,7 @@ void SAL_CALL OConnection::setCatalog(const rtl::OUString& /*catalog*/) // TODO How? } -rtl::OUString SAL_CALL OConnection::getCatalog() +OUString SAL_CALL OConnection::getCatalog() { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -464,9 +464,9 @@ sal_Int32 OConnection::getMysqlVersion() return static_cast<sal_Int32>(version); } -rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL) +OUString OConnection::transFormPreparedStatement(const OUString& _sSQL) { - rtl::OUString sSqlStatement = _sSQL; + OUString sSqlStatement = _sSQL; if (!m_xParameterSubstitution.is()) { try diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index ed96d5e42290..b1c8d5bda8ed 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -69,8 +69,8 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWar struct ConnectionSettings { rtl_TextEncoding encoding; - rtl::OUString schema; - rtl::OUString connectionURL; + OUString schema; + OUString connectionURL; bool readOnly; ConnectionSettings() : encoding(RTL_TEXTENCODING_DONTKNOW) @@ -110,8 +110,7 @@ public: sal_Int32 getMysqlVersion(); /// @throws SQLException - void construct(const rtl::OUString& url, - const css::uno::Sequence<css::beans::PropertyValue>& info); + void construct(const OUString& url, const css::uno::Sequence<css::beans::PropertyValue>& info); OConnection(MysqlCDriver& _rDriver); virtual ~OConnection() override; @@ -122,22 +121,22 @@ public: virtual void SAL_CALL disposing() override; // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XConnection css::uno::Reference<css::sdbc::XStatement> SAL_CALL createStatement() override; css::uno::Reference<css::sdbc::XPreparedStatement> - SAL_CALL prepareStatement(const rtl::OUString& sql) override; + SAL_CALL prepareStatement(const OUString& sql) override; css::uno::Reference<css::sdbc::XPreparedStatement> - SAL_CALL prepareCall(const rtl::OUString& sql) override; + SAL_CALL prepareCall(const OUString& sql) override; - rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) override; + OUString SAL_CALL nativeSQL(const OUString& sql) override; void SAL_CALL setAutoCommit(sal_Bool autoCommit) override; @@ -155,9 +154,9 @@ public: sal_Bool SAL_CALL isReadOnly() override; - void SAL_CALL setCatalog(const rtl::OUString& catalog) override; + void SAL_CALL setCatalog(const OUString& catalog) override; - rtl::OUString SAL_CALL getCatalog() override; + OUString SAL_CALL getCatalog() override; void SAL_CALL setTransactionIsolation(sal_Int32 level) override; @@ -173,15 +172,15 @@ public: void SAL_CALL clearWarnings() override; // TODO: Not used - //sal_Int32 sdbcColumnType(rtl::OUString typeName); + //sal_Int32 sdbcColumnType(OUString typeName); const ConnectionSettings& getConnectionSettings() const { return m_settings; } - rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL); + OUString transFormPreparedStatement(const OUString& _sSQL); const MysqlCDriver& getDriver() const { return *m_xDriver.get(); } }; /* OConnection */ // TODO: Not used. -//inline rtl::OUString getPattern(rtl::OUString p) { return (p.getLength()) ? p : ASC2OU("%"); } +//inline OUString getPattern(OUString p) { return (p.getLength()) ? p : ASC2OU("%"); } } /* mysqlc */ } /* connectivity */ #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx index a1575c728298..507ce0b91e45 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx @@ -79,7 +79,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon, MYSQL* pMySql) ODatabaseMetaData::~ODatabaseMetaData() {} -rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return rtl::OUString(); } +OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return OUString(); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() { return 16777208L; } @@ -172,11 +172,11 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength() { return 256; } sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns() { return true; } -rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return rtl::OUString("n/a"); } +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return OUString("n/a"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return rtl::OUString("\""); } +OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return OUString("\""); } -rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return rtl::OUString("#@"); } +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return OUString("#@"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames() { return true; } @@ -355,39 +355,33 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds() sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL() { return false; } -rtl::OUString SAL_CALL ODatabaseMetaData::getURL() +OUString SAL_CALL ODatabaseMetaData::getURL() { return m_rConnection.getConnectionSettings().connectionURL; } -rtl::OUString SAL_CALL ODatabaseMetaData::getUserName() +OUString SAL_CALL ODatabaseMetaData::getUserName() { // TODO execute "SELECT USER()" SAL_WARN("connectivity.mysqlc", "method not implemented"); - return rtl::OUString(); + return OUString(); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName() -{ - return rtl::OUString("MySQL Connector/OO.org"); -} +OUString SAL_CALL ODatabaseMetaData::getDriverName() { return OUString("MySQL Connector/OO.org"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return rtl::OUString("0.9.2"); } +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return OUString("0.9.2"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion() +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion() { - return rtl::OStringToOUString(mysql_get_server_info(m_pMySql), - m_rConnection.getConnectionEncoding()); + return OStringToOUString(mysql_get_server_info(m_pMySql), + m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() -{ - return rtl::OUString("MySQL"); -} +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() { return OUString("MySQL"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return rtl::OUString("procedure"); } +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return OUString("procedure"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return rtl::OUString("database"); } +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return OUString("database"); } sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion() { @@ -409,87 +403,87 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion() return MARIADBC_VERSION_MINOR; } -rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords() +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords() { - return rtl::OUString("ACCESSIBLE, ADD, ALL," - "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE," - "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL," - "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK," - "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT," - "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE," - "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR," - "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND," - "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE," - "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE," - "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE," - "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED," - "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH," - "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM," - "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY," - "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF," - "IGNORE, IN, INDEX, INFILE, INNER, INOUT," - "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4," - "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN," - "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE," - "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT," - "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT," - "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND," - "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT," - "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE," - "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER," - "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE," - "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL," - "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT," - "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT," - "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT," - "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL," - "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING," - "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT," - "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED," - "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING," - "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK," - "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE," - "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR," - "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH," - "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL" - "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD," - "MAXVALUE, RESIGNAL, SIGNAL, SLOW"); + return OUString("ACCESSIBLE, ADD, ALL," + "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE," + "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL," + "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK," + "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT," + "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE," + "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR," + "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND," + "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE," + "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE," + "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE," + "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED," + "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH," + "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM," + "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY," + "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF," + "IGNORE, IN, INDEX, INFILE, INNER, INOUT," + "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4," + "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN," + "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE," + "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT," + "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT," + "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND," + "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT," + "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE," + "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER," + "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE," + "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL," + "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT," + "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT," + "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT," + "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL," + "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING," + "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT," + "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED," + "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING," + "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK," + "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE," + "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR," + "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH," + "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL" + "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD," + "MAXVALUE, RESIGNAL, SIGNAL, SLOW"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return rtl::OUString("\\"); } +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return OUString("\\"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions() +OUString SAL_CALL ODatabaseMetaData::getStringFunctions() { - return rtl::OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT," - "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT," - "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD," - "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION," - "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX," - "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING," - "SUBSTRING_INDEX,TRIM,UCASE,UPPER"); + return OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT," + "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT," + "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD," + "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION," + "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX," + "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING," + "SUBSTRING_INDEX,TRIM,UCASE,UPPER"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions() +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions() { - return rtl::OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME," - "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD," - "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT," - "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE," - "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME," - "SEC_TO_TIME,TIME_TO_SEC"); + return OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME," + "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD," + "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT," + "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE," + "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME," + "SEC_TO_TIME,TIME_TO_SEC"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions() +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions() { - return rtl::OUString("DATABASE,USER,SYSTEM_USER," - "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION"); + return OUString("DATABASE,USER,SYSTEM_USER," + "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions() +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions() { - return rtl::OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS," - "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW," - "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE"); + return OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS," + "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW," + "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar() { return false; } @@ -643,11 +637,11 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas() UNO_QUERY); std::vector<std::vector<Any>> rRows; - rtl::OUString sSql + OUString sSql = m_rConnection.getMysqlVersion() > 49999 - ? rtl::OUString{ "SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG " - "FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME" } - : rtl::OUString{ "SHOW DATABASES" }; + ? OUString{ "SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG " + "FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME" } + : OUString{ "SHOW DATABASES" }; Reference<XStatement> statement = m_rConnection.createStatement(); Reference<XInterface> executed = statement->executeQuery(sSql); @@ -663,7 +657,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas() bool informationSchema = false; for (sal_uInt32 i = 1; i <= columns; i++) { - rtl::OUString columnStringValue = xRow->getString(i); + OUString columnStringValue = xRow->getString(i); if (i == 1) { // TABLE_SCHEM informationSchema = !columnStringValue.equalsIgnoreAsciiCase("information_schema"); @@ -680,16 +674,17 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas() return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumnPrivileges( - const Any& /*catalog*/, const rtl::OUString& schema, const rtl::OUString& table, - const rtl::OUString& columnNamePattern) +Reference<XResultSet> + SAL_CALL ODatabaseMetaData::getColumnPrivileges(const Any& /*catalog*/, const OUString& schema, + const OUString& table, + const OUString& columnNamePattern) { - rtl::OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS " - "TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, NULL AS GRANTOR, " - "GRANTEE, PRIVILEGE_TYPE AS PRIVILEGE, IS_GRANTABLE FROM " - "INFORMATION_SCHEMA.COLUMN_PRIVILEGES WHERE TABLE_SCHEMA LIKE " - "'?' AND TABLE_NAME='?' AND COLUMN_NAME LIKE '?' ORDER BY " - "COLUMN_NAME, PRIVILEGE_TYPE"); + OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS " + "TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, NULL AS GRANTOR, " + "GRANTEE, PRIVILEGE_TYPE AS PRIVILEGE, IS_GRANTABLE FROM " + "INFORMATION_SCHEMA.COLUMN_PRIVILEGES WHERE TABLE_SCHEMA LIKE " + "'?' AND TABLE_NAME='?' AND COLUMN_NAME LIKE '?' ORDER BY " + "COLUMN_NAME, PRIVILEGE_TYPE"); query = query.replaceFirst("?", schema); query = query.replaceFirst("?", table); @@ -701,34 +696,34 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumnPrivileges( } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalog*/, - const rtl::OUString& /*schemaPattern*/, - const rtl::OUString& tableNamePattern, - const rtl::OUString& columnNamePattern) + const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, + const OUString& columnNamePattern) { - rtl::OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1 - "TABLE_SCHEMA AS TABLE_SCHEM, " // 2 - "TABLE_NAME, " // 3 - "COLUMN_NAME, " // 4 - "DATA_TYPE, " // 5 - // TYPE_NAME missing - "CHARACTER_MAXIMUM_LENGTH, " // 6 - "NUMERIC_PRECISION, " // 7 - // buffer length missing - "NUMERIC_SCALE AS DECIMAL_DIGITS, " // 8 - // NUM_PREC_RADIX missing - // NULLABLE missing - "COLUMN_COMMENT AS REMARKS, " // 9 - "COLUMN_DEFAULT AS COLUMN_DEF," // 10 - "CHARACTER_OCTET_LENGTH, " // 11 - "ORDINAL_POSITION, " // 12 - "IS_NULLABLE, " // 13 - "COLUMN_TYPE " // 14 - "FROM INFORMATION_SCHEMA.COLUMNS " - "WHERE (1 = 1) "); + OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1 + "TABLE_SCHEMA AS TABLE_SCHEM, " // 2 + "TABLE_NAME, " // 3 + "COLUMN_NAME, " // 4 + "DATA_TYPE, " // 5 + // TYPE_NAME missing + "CHARACTER_MAXIMUM_LENGTH, " // 6 + "NUMERIC_PRECISION, " // 7 + // buffer length missing + "NUMERIC_SCALE AS DECIMAL_DIGITS, " // 8 + // NUM_PREC_RADIX missing + // NULLABLE missing + "COLUMN_COMMENT AS REMARKS, " // 9 + "COLUMN_DEFAULT AS COLUMN_DEF," // 10 + "CHARACTER_OCTET_LENGTH, " // 11 + "ORDINAL_POSITION, " // 12 + "IS_NULLABLE, " // 13 + "COLUMN_TYPE " // 14 + "FROM INFORMATION_SCHEMA.COLUMNS " + "WHERE (1 = 1) "); if (!tableNamePattern.isEmpty()) { - rtl::OUString sAppend; + OUString sAppend; if (tableNamePattern.match("%")) sAppend = "AND TABLE_NAME LIKE '%' "; else @@ -737,7 +732,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo } if (!columnNamePattern.isEmpty()) { - rtl::OUString sAppend; + OUString sAppend; if (columnNamePattern.match("%")) sAppend = "AND COLUMN_NAME LIKE '%' "; else @@ -745,7 +740,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo queryBuf.append(sAppend.replaceAll("%", columnNamePattern)); } - rtl::OUString query = queryBuf.makeStringAndClear(); + OUString query = queryBuf.makeStringAndClear(); Reference<XStatement> statement = m_rConnection.createStatement(); Reference<XResultSet> rs = statement->executeQuery(query.getStr()); Reference<XRow> xRow(rs, UNO_QUERY_THROW); @@ -767,13 +762,13 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo // column name aRow.push_back(makeAny(xRow->getString(4))); // data type - rtl::OUString sDataType = xRow->getString(5); + OUString sDataType = xRow->getString(5); aRow.push_back(makeAny(mysqlc_sdbc_driver::mysqlStrToOOOType(sDataType))); // type name aRow.push_back(makeAny(sDataType)); // TODO // column size sal_Int32 nColumnSize = 0; - rtl::OUString sColumnType = xRow->getString(14); + OUString sColumnType = xRow->getString(14); sal_Int32 nCharMaxLen = xRow->getShort(6); bool bIsCharMax = !xRow->wasNull(); if (sDataType.equalsIgnoreAsciiCase("year")) @@ -796,7 +791,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo // num_prec_radix aRow.push_back(makeAny(sal_Int32(10))); // nullable - rtl::OUString sIsNullable = xRow->getString(13); + OUString sIsNullable = xRow->getString(13); if (xRow->wasNull()) aRow.push_back(makeAny(ColumnValue::NULLABLE_UNKNOWN)); else if (sIsNullable.equalsIgnoreAsciiCase("YES")) @@ -823,11 +818,12 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables( - const Any& /*catalog*/, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern, const Sequence<rtl::OUString>& /*types */) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables(const Any& /*catalog*/, + const OUString& schemaPattern, + const OUString& tableNamePattern, + const Sequence<OUString>& /*types */) { - rtl::OUString query( + OUString query( "SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS TABLE_SCHEM, TABLE_NAME," "IF(STRCMP(TABLE_TYPE,'BASE TABLE'), TABLE_TYPE, 'TABLE') AS TABLE_TYPE, TABLE_COMMENT AS " "REMARKS " @@ -845,8 +841,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables( } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedureColumns( - const Any& /* catalog */, const rtl::OUString& /* schemaPattern */, - const rtl::OUString& /* procedureNamePattern */, const rtl::OUString& /* columnNamePattern */) + const Any& /* catalog */, const OUString& /* schemaPattern */, + const OUString& /* procedureNamePattern */, const OUString& /* columnNamePattern */) { // Currently there is no information available return nullptr; @@ -854,8 +850,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedureColumns( Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedures(const Any& /*catalog*/, - const rtl::OUString& /*schemaPattern*/, - const rtl::OUString& /*procedureNamePattern*/) + const OUString& /*schemaPattern*/, + const OUString& /*procedureNamePattern*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -867,8 +863,9 @@ Reference<XResultSet> return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& /* catalog */, const rtl::OUString& /* schema */, const rtl::OUString& /* table */) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns(const Any& /* catalog */, + const OUString& /* schema */, + const OUString& /* table */) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -879,8 +876,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns( } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getExportedKeys(const Any& /*catalog */, - const rtl::OUString& /*schema */, - const rtl::OUString& /*table */) + const OUString& /*schema */, + const OUString& /*table */) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -893,14 +890,14 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getExportedKeys(const Any& /*c } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*catalog*/, - const rtl::OUString& schema, - const rtl::OUString& table) + const OUString& schema, + const OUString& table) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), UNO_QUERY); - rtl::OUString query( + OUString query( "SELECT refi.CONSTRAINT_CATALOG, k.COLUMN_NAME, " " refi.UNIQUE_CONSTRAINT_CATALOG, " " refi.UNIQUE_CONSTRAINT_SCHEMA, refi.REFERENCED_TABLE_NAME, k.REFERENCED_COLUMN_NAME, " @@ -959,16 +956,15 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*c } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getPrimaryKeys(const Any& /*catalog*/, - const rtl::OUString& schema, - const rtl::OUString& table) + const OUString& schema, + const OUString& table) { - rtl::OUString query( - "SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA " - "AS TABLE_SCHEM, TABLE_NAME, " - "COLUMN_NAME, SEQ_IN_INDEX AS KEY_SEQ," - "INDEX_NAME AS PK_NAME FROM INFORMATION_SCHEMA.STATISTICS " - "WHERE TABLE_SCHEMA LIKE '?' AND TABLE_NAME LIKE '?' AND INDEX_NAME='PRIMARY' " - "ORDER BY TABLE_SCHEMA, TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX"); + OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA " + "AS TABLE_SCHEM, TABLE_NAME, " + "COLUMN_NAME, SEQ_IN_INDEX AS KEY_SEQ," + "INDEX_NAME AS PK_NAME FROM INFORMATION_SCHEMA.STATISTICS " + "WHERE TABLE_SCHEMA LIKE '?' AND TABLE_NAME LIKE '?' AND INDEX_NAME='PRIMARY' " + "ORDER BY TABLE_SCHEMA, TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX"); // TODO use prepared stmt instead // TODO escape schema, table name ? @@ -981,8 +977,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getPrimaryKeys(const Any& /*ca } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getIndexInfo(const Any& /*catalog*/, - const rtl::OUString& /*schema*/, - const rtl::OUString& /*table*/, + const OUString& /*schema*/, + const OUString& /*table*/, sal_Bool /*unique*/, sal_Bool /*approximate*/) { @@ -996,9 +992,11 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getIndexInfo(const Any& /*cata return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier( - const Any& /*catalog*/, const rtl::OUString& /*schema*/, const rtl::OUString& /*table*/, - sal_Int32 /*scope*/, sal_Bool /*nullable*/) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(const Any& /*catalog*/, + const OUString& /*schema*/, + const OUString& /*table*/, + sal_Int32 /*scope*/, + sal_Bool /*nullable*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -1010,10 +1008,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier( return xResultSet; } -Reference<XResultSet> - SAL_CALL ODatabaseMetaData::getTablePrivileges(const Any& /*catalog*/, - const rtl::OUString& /*schemaPattern*/, - const rtl::OUString& /*tableNamePattern*/) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTablePrivileges( + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -1026,9 +1022,9 @@ Reference<XResultSet> } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference( - const Any& /*primaryCatalog*/, const rtl::OUString& /*primarySchema_*/, - const rtl::OUString& /*primaryTable_*/, const Any& /*foreignCatalog*/, - const rtl::OUString& /*foreignSchema*/, const rtl::OUString& /*foreignTable*/) + const Any& /*primaryCatalog*/, const OUString& /*primarySchema_*/, + const OUString& /*primaryTable_*/, const Any& /*foreignCatalog*/, + const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -1040,9 +1036,10 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference( return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getUDTs( - const Any& /* catalog */, const rtl::OUString& /* schemaPattern */, - const rtl::OUString& /* typeNamePattern */, const Sequence<sal_Int32>& /* types */) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getUDTs(const Any& /* catalog */, + const OUString& /* schemaPattern */, + const OUString& /* typeNamePattern */, + const Sequence<sal_Int32>& /* types */) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this); return nullptr; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx index 68865ae0bf1a..6814a574c87d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx @@ -50,17 +50,17 @@ public: // XDatabaseMetaData sal_Bool SAL_CALL allProceduresAreCallable() override; sal_Bool SAL_CALL allTablesAreSelectable() override; - rtl::OUString SAL_CALL getURL() override; - rtl::OUString SAL_CALL getUserName() override; + OUString SAL_CALL getURL() override; + OUString SAL_CALL getUserName() override; sal_Bool SAL_CALL isReadOnly() override; sal_Bool SAL_CALL nullsAreSortedHigh() override; sal_Bool SAL_CALL nullsAreSortedLow() override; sal_Bool SAL_CALL nullsAreSortedAtStart() override; sal_Bool SAL_CALL nullsAreSortedAtEnd() override; - rtl::OUString SAL_CALL getDatabaseProductName() override; - rtl::OUString SAL_CALL getDatabaseProductVersion() override; - rtl::OUString SAL_CALL getDriverName() override; - rtl::OUString SAL_CALL getDriverVersion() override; + OUString SAL_CALL getDatabaseProductName() override; + OUString SAL_CALL getDatabaseProductVersion() override; + OUString SAL_CALL getDriverName() override; + OUString SAL_CALL getDriverVersion() override; sal_Int32 SAL_CALL getDriverMajorVersion() override; sal_Int32 SAL_CALL getDriverMinorVersion() override; sal_Bool SAL_CALL usesLocalFiles() override; @@ -73,14 +73,14 @@ public: sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() override; sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() override; sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() override; - rtl::OUString SAL_CALL getIdentifierQuoteString() override; - rtl::OUString SAL_CALL getSQLKeywords() override; - rtl::OUString SAL_CALL getNumericFunctions() override; - rtl::OUString SAL_CALL getStringFunctions() override; - rtl::OUString SAL_CALL getSystemFunctions() override; - rtl::OUString SAL_CALL getTimeDateFunctions() override; - rtl::OUString SAL_CALL getSearchStringEscape() override; - rtl::OUString SAL_CALL getExtraNameCharacters() override; + OUString SAL_CALL getIdentifierQuoteString() override; + OUString SAL_CALL getSQLKeywords() override; + OUString SAL_CALL getNumericFunctions() override; + OUString SAL_CALL getStringFunctions() override; + OUString SAL_CALL getSystemFunctions() override; + OUString SAL_CALL getTimeDateFunctions() override; + OUString SAL_CALL getSearchStringEscape() override; + OUString SAL_CALL getExtraNameCharacters() override; sal_Bool SAL_CALL supportsAlterTableWithAddColumn() override; sal_Bool SAL_CALL supportsAlterTableWithDropColumn() override; sal_Bool SAL_CALL supportsColumnAliasing() override; @@ -108,11 +108,11 @@ public: sal_Bool SAL_CALL supportsOuterJoins() override; sal_Bool SAL_CALL supportsFullOuterJoins() override; sal_Bool SAL_CALL supportsLimitedOuterJoins() override; - rtl::OUString SAL_CALL getSchemaTerm() override; - rtl::OUString SAL_CALL getProcedureTerm() override; - rtl::OUString SAL_CALL getCatalogTerm() override; + OUString SAL_CALL getSchemaTerm() override; + OUString SAL_CALL getProcedureTerm() override; + OUString SAL_CALL getCatalogTerm() override; sal_Bool SAL_CALL isCatalogAtStart() override; - rtl::OUString SAL_CALL getCatalogSeparator() override; + OUString SAL_CALL getCatalogSeparator() override; sal_Bool SAL_CALL supportsSchemasInDataManipulation() override; sal_Bool SAL_CALL supportsSchemasInProcedureCalls() override; sal_Bool SAL_CALL supportsSchemasInTableDefinitions() override; @@ -167,57 +167,51 @@ public: sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() override; sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& procedureNamePattern) override; + SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& procedureNamePattern, - const rtl::OUString& columnNamePattern) override; + SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern, + const OUString& columnNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern, - const css::uno::Sequence<rtl::OUString>& types) override; + SAL_CALL getTables(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, + const css::uno::Sequence<OUString>& types) override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getSchemas() override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getCatalogs() override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getTableTypes() override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern, - const rtl::OUString& columnNamePattern) override; + SAL_CALL getColumns(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, + const OUString& columnNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table, - const rtl::OUString& columnNamePattern) override; + SAL_CALL getColumnPrivileges(const Any& catalog, const OUString& schema, + const OUString& table, + const OUString& columnNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern) override; + SAL_CALL getTablePrivileges(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table, sal_Int32 scope, + SAL_CALL getBestRowIdentifier(const Any& catalog, const OUString& schema, + const OUString& table, sal_Int32 scope, sal_Bool nullable) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getVersionColumns(const Any& catalog, const OUString& schema, const OUString& table) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getPrimaryKeys(const Any& catalog, const OUString& schema, const OUString& table) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getImportedKeys(const Any& catalog, const OUString& schema, const OUString& table) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getExportedKeys(const Any& catalog, const OUString& schema, const OUString& table) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) override; - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) override; - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) override; - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) override; - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, - const rtl::OUString& primaryTable, const Any& foreignCatalog, - const rtl::OUString& foreignSchema, - const rtl::OUString& foreignTable) override; + SAL_CALL getCrossReference(const Any& primaryCatalog, const OUString& primarySchema, + const OUString& primaryTable, const Any& foreignCatalog, + const OUString& foreignSchema, + const OUString& foreignTable) override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getTypeInfo() override; - css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getIndexInfo(const Any& catalog, - const rtl::OUString& schema, - const rtl::OUString& table, - sal_Bool unique, - sal_Bool approximate) override; + css::uno::Reference<css::sdbc::XResultSet> + SAL_CALL getIndexInfo(const Any& catalog, const OUString& schema, const OUString& table, + sal_Bool unique, sal_Bool approximate) override; sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) override; sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) override; @@ -232,8 +226,8 @@ public: sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) override; sal_Bool SAL_CALL supportsBatchUpdates() override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& typeNamePattern, + SAL_CALL getUDTs(const Any& catalog, const OUString& schemaPattern, + const OUString& typeNamePattern, const css::uno::Sequence<sal_Int32>& types) override; css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection() override; }; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx index 6a8a492f68b6..b55d9cfeeeaf 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx @@ -37,7 +37,6 @@ using css::uno::Exception; using css::uno::Reference; using css::uno::RuntimeException; using css::uno::Sequence; -using rtl::OUString; Reference<css::uno::XInterface> MysqlCDriver_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory); diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx index d56be8b88500..179241193332 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx @@ -90,16 +90,16 @@ void allocateSqlVar(void** mem, enum_field_types eType, unsigned nSize) void throwFeatureNotImplementedException(const sal_Char* _pAsciiFeatureName, const css::uno::Reference<XInterface>& _rxContext) { - const rtl::OUString sMessage - = rtl::OUString::createFromAscii(_pAsciiFeatureName) + ": feature not implemented."; + const OUString sMessage + = OUString::createFromAscii(_pAsciiFeatureName) + ": feature not implemented."; throw SQLException(sMessage, _rxContext, "HYC00", 0, Any()); } void throwInvalidArgumentException(const sal_Char* _pAsciiFeatureName, const css::uno::Reference<XInterface>& _rxContext) { - const rtl::OUString sMessage - = rtl::OUString::createFromAscii(_pAsciiFeatureName) + ": invalid arguments."; + const OUString sMessage + = OUString::createFromAscii(_pAsciiFeatureName) + ": invalid arguments."; throw SQLException(sMessage, _rxContext, "HYC00", 0, Any()); } @@ -107,10 +107,10 @@ void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum, const css::uno::Reference<css::uno::XInterface>& _context, const rtl_TextEncoding encoding) { - rtl::OString errorMsg{ msg }; + OString errorMsg{ msg }; // TODO error code? - throw SQLException(rtl::OStringToOUString(errorMsg, encoding), _context, rtl::OUString(), - errorNum, Any()); + throw SQLException(OStringToOUString(errorMsg, encoding), _context, OUString(), errorNum, + Any()); } sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept @@ -182,7 +182,7 @@ sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept return css::sdbc::DataType::VARCHAR; } -sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType) +sal_Int32 mysqlStrToOOOType(const OUString& sType) { // TODO other types. if (sType.equalsIgnoreAsciiCase("tiny") || sType.equalsIgnoreAsciiCase("tinyint")) @@ -225,7 +225,7 @@ sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType) return css::sdbc::DataType::VARCHAR; } -rtl::OUString mysqlTypeToStr(MYSQL_FIELD* field) +OUString mysqlTypeToStr(MYSQL_FIELD* field) { bool isUnsigned = (field->flags & UNSIGNED_FLAG) != 0; bool isZerofill = (field->flags & ZEROFILL_FLAG) != 0; @@ -322,9 +322,9 @@ rtl::OUString mysqlTypeToStr(MYSQL_FIELD* field) } } -rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) +OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) { - return rtl::OUString(_string.c_str(), _string.size(), encoding); + return OUString(_string.c_str(), _string.size(), encoding); } } /* namespace */ diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx index 2d468bb367da..a7886c3015d2 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx @@ -107,11 +107,11 @@ void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum, sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept; -rtl::OUString mysqlTypeToStr(MYSQL_FIELD* pField); +OUString mysqlTypeToStr(MYSQL_FIELD* pField); -sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType); +sal_Int32 mysqlStrToOOOType(const OUString& sType); -rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); +OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); } #endif diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index 1f55c2466cb6..a3e45937b610 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -52,20 +52,20 @@ using ::osl::MutexGuard; #include <stdio.h> -rtl::OUString SAL_CALL OPreparedResultSet::getImplementationName() +OUString SAL_CALL OPreparedResultSet::getImplementationName() { - return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); + return OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); } -uno::Sequence<rtl::OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aSupported(2); + uno::Sequence<OUString> aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return aSupported; } -sal_Bool SAL_CALL OPreparedResultSet::supportsService(const rtl::OUString& _rServiceName) +sal_Bool SAL_CALL OPreparedResultSet::supportsService(const OUString& _rServiceName) { return cppu::supportsService(this, _rServiceName); } @@ -112,7 +112,7 @@ uno::Sequence<Type> SAL_CALL OPreparedResultSet::getTypes() return concatSequences(aTypes.getTypes(), OPreparedResultSet_BASE::getTypes()); } -sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const rtl::OUString& columnName) +sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const OUString& columnName) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); @@ -370,7 +370,7 @@ sal_Int16 SAL_CALL OPreparedResultSet::getShort(sal_Int32 column) return *static_cast<sal_Int16*>(m_aData[column - 1].buffer); } -rtl::OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column) +OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); @@ -391,7 +391,7 @@ rtl::OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column) const char* sStr = static_cast<const char*>(m_aData[column - 1].buffer); - OUString sReturn = rtl::OUString(sStr, *m_aData[column - 1].length, m_encoding); + OUString sReturn = OUString(sStr, *m_aData[column - 1].length, m_encoding); return sReturn; } @@ -827,7 +827,7 @@ void SAL_CALL OPreparedResultSet::updateDouble(sal_Int32 column, double /* x */) *this); } -void SAL_CALL OPreparedResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */) +void SAL_CALL OPreparedResultSet::updateString(sal_Int32 column, const OUString& /* x */) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); @@ -1036,7 +1036,7 @@ void OPreparedResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw uno::Exception("cannot set prop " + rtl::OUString::number(nHandle), nullptr); + throw uno::Exception("cannot set prop " + OUString::number(nHandle), nullptr); case PROPERTY_ID_FETCHDIRECTION: break; case PROPERTY_ID_FETCHSIZE: @@ -1083,11 +1083,11 @@ css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL OPreparedResultSet::g void OPreparedResultSet::checkColumnIndex(sal_Int32 index) { if (!m_aData) - throw SQLException("Cursor out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("Cursor out of range", *this, OUString(), 1, Any()); if (index < 1 || index > static_cast<int>(m_nFieldCount)) { /* static object for efficiency or thread safety is a problem ? */ - throw SQLException("index out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("index out of range", *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx index 7f5d6852c539..647d872c50d8 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -95,11 +95,11 @@ class OPreparedResultSet final : public OBase_Mutex, virtual ~OPreparedResultSet() override = default; public: - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; OPreparedResultSet(OConnection& rConn, OPreparedStatement* pStmt, MYSQL_STMT* pMyStmt); @@ -147,7 +147,7 @@ public: // XRow sal_Bool SAL_CALL wasNull() override; - rtl::OUString SAL_CALL getString(sal_Int32 column) override; + OUString SAL_CALL getString(sal_Int32 column) override; sal_Bool SAL_CALL getBoolean(sal_Int32 column) override; sal_Int8 SAL_CALL getByte(sal_Int32 column) override; @@ -205,7 +205,7 @@ public: void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) override; void SAL_CALL updateFloat(sal_Int32 column, float x) override; void SAL_CALL updateDouble(sal_Int32 column, double x) override; - void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) override; + void SAL_CALL updateString(sal_Int32 column, const OUString& x) override; void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence<sal_Int8>& x) override; void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) override; void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) override; @@ -220,7 +220,7 @@ public: void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override; // XColumnLocate - sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override; + sal_Int32 SAL_CALL findColumn(const OUString& columnName) override; // XRowLocate Any SAL_CALL getBookmark() override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx index 05204fe652a0..9b687f74e8ad 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx @@ -42,19 +42,19 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; using ::osl::MutexGuard; -rtl::OUString OPreparedStatement::getImplementationName() +OUString OPreparedStatement::getImplementationName() { - return rtl::OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement"); + return OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement"); } -css::uno::Sequence<rtl::OUString> OPreparedStatement::getSupportedServiceNames() +css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames() { - css::uno::Sequence<rtl::OUString> s(1); + css::uno::Sequence<OUString> s(1); s[0] = "com.sun.star.sdbc.PreparedStatement"; return s; } -sal_Bool OPreparedStatement::supportsService(rtl::OUString const& ServiceName) +sal_Bool OPreparedStatement::supportsService(OUString const& ServiceName) { return cppu::supportsService(this, ServiceName); } @@ -176,13 +176,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() return affectedRows; } -void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUString& x) +void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& x) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - rtl::OString stringie(rtl::OUStringToOString(x, m_xConnection->getConnectionEncoding())); + OString stringie(OUStringToOString(x, m_xConnection->getConnectionEncoding())); const sal_Int32 nIndex = parameter - 1; m_binds[nIndex].buffer_type = MYSQL_TYPE_STRING; mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer, stringie.getStr(), MYSQL_TYPE_STRING, @@ -425,7 +425,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co case DataType::NUMERIC: { double nValue(0.0); - rtl::OUString sValue; + OUString sValue; if (value >>= nValue) { setDouble(parameterIndex, nValue); @@ -433,8 +433,8 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co } else if (value >>= sValue) { - rtl::OString sAscii - = rtl::OUStringToOString(sValue, getOwnConnection()->getConnectionEncoding()); + OString sAscii + = OUStringToOString(sValue, getOwnConnection()->getConnectionEncoding()); std::stringstream sStream{ sAscii.getStr() }; sStream >> nValue; m_binds[nIndex].buffer_type = MYSQL_TYPE_DOUBLE; @@ -461,7 +461,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co } void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, - const rtl::OUString& /* typeName */) + const OUString& /* typeName */) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -580,7 +580,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 column) { if (column < 1 || column > static_cast<sal_Int32>(m_paramCount)) { - throw SQLException("Parameter index out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("Parameter index out of range", *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx index 5d985de72e4b..1df2c704a38d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx @@ -65,11 +65,11 @@ class OPreparedStatement final : public OCommonStatement, public OPreparedStatem virtual ~OPreparedStatement() override; public: - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; OPreparedStatement(OConnection* _pConnection, MYSQL_STMT* pStmt); @@ -96,7 +96,7 @@ public: void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) override; void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, - const rtl::OUString& typeName) override; + const OUString& typeName) override; void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) override; @@ -112,7 +112,7 @@ public: void SAL_CALL setDouble(sal_Int32 parameter, double x) override; - void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) override; + void SAL_CALL setString(sal_Int32 parameter, const OUString& x) override; void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence<sal_Int8>& x) override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx index 3a6e063d7dbf..ab018ef9a777 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx @@ -79,24 +79,24 @@ void OResultSet::checkRowIndex() { if (m_nRowPosition <= 0 || m_nRowPosition > m_nRowCount) { - throw SQLException("Cursor position out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("Cursor position out of range", *this, OUString(), 1, Any()); } } -rtl::OUString SAL_CALL OResultSet::getImplementationName() +OUString SAL_CALL OResultSet::getImplementationName() { - return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); + return OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); } -uno::Sequence<rtl::OUString> SAL_CALL OResultSet::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL OResultSet::getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aSupported(2); + uno::Sequence<OUString> aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName) +sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) { return cppu::supportsService(this, _rServiceName); } @@ -149,7 +149,7 @@ uno::Sequence<Type> SAL_CALL OResultSet::getTypes() return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes()); } -sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName) +sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName) { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -255,8 +255,8 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column) return d; } - rtl::OString dateString(dateStr); - rtl::OString token; + OString dateString(dateStr); + OString token; sal_Int32 nIndex = 0, i = 0; do { @@ -443,7 +443,7 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column) return std::atoi(pValue); } -rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column) +OUString SAL_CALL OResultSet::getString(sal_Int32 column) { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -454,10 +454,10 @@ rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column) if (!pValue) { m_bWasNull = true; - return rtl::OUString{}; + return OUString{}; } m_bWasNull = false; - return rtl::OUString(pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding); + return OUString(pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding); } Time SAL_CALL OResultSet::getTime(sal_Int32 column) @@ -474,8 +474,8 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column) m_bWasNull = true; return t; } - rtl::OUString timeString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }; - rtl::OUString token; + OUString timeString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }; + OUString token; sal_Int32 nIndex, i = 0; nIndex = timeString.indexOf(' ') + 1; @@ -516,8 +516,8 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column) } // YY-MM-DD HH:MM:SS - std::vector<rtl::OUString> dateAndTime = lcl_split( - rtl::OUString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }, u' '); + std::vector<OUString> dateAndTime = lcl_split( + OUString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }, u' '); auto dateParts = lcl_split(dateAndTime.at(0), u'-'); auto timeParts = lcl_split(dateAndTime.at(1), u':'); @@ -859,7 +859,7 @@ void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDouble", *this); } -void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */) +void SAL_CALL OResultSet::updateString(sal_Int32 column, const OUString& /* x */) { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1062,7 +1062,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw uno::Exception("cannot set prop " + rtl::OUString::number(nHandle), nullptr); + throw uno::Exception("cannot set prop " + OUString::number(nHandle), nullptr); case PROPERTY_ID_FETCHDIRECTION: break; case PROPERTY_ID_FETCHSIZE: @@ -1111,7 +1111,7 @@ void OResultSet::checkColumnIndex(sal_Int32 index) if (index < 1 || index > static_cast<int>(fieldCount)) { /* static object for efficiency or thread safety is a problem ? */ - throw SQLException("index out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("index out of range", *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx index 59b956850487..ce9f7bd61db8 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx @@ -91,11 +91,11 @@ class OResultSet final : public OBase_Mutex, virtual ~OResultSet() override = default; public: - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* pResult, rtl_TextEncoding _encoding); @@ -144,7 +144,7 @@ public: // XRow sal_Bool SAL_CALL wasNull() override; - rtl::OUString SAL_CALL getString(sal_Int32 column) override; + OUString SAL_CALL getString(sal_Int32 column) override; sal_Bool SAL_CALL getBoolean(sal_Int32 column) override; sal_Int8 SAL_CALL getByte(sal_Int32 column) override; @@ -202,7 +202,7 @@ public: void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) override; void SAL_CALL updateFloat(sal_Int32 column, float x) override; void SAL_CALL updateDouble(sal_Int32 column, double x) override; - void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) override; + void SAL_CALL updateString(sal_Int32 column, const OUString& x) override; void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence<sal_Int8>& x) override; void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) override; void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) override; @@ -217,7 +217,7 @@ public: void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override; // XColumnLocate - sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override; + sal_Int32 SAL_CALL findColumn(const OUString& columnName) override; // XRowLocate Any SAL_CALL getBookmark() override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx index 106ad775e7e5..f5962a2a54ff 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx @@ -56,8 +56,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) // MYSQL_FIELD::charsetnr is the collation identifier // _ci postfix means it's insensitive MYSQL_FIELD* pField = getField(column); - rtl::OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" }; - sql.append(rtl::OUString::number(pField->charsetnr)); + OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" }; + sql.append(OUString::number(pField->charsetnr)); Reference<XStatement> stmt = m_rConnection.createStatement(); Reference<XResultSet> rs = stmt->executeQuery(sql.makeStringAndClear()); @@ -66,42 +66,42 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) if (!rs->next()) // fetch first and only row return false; - rtl::OUString sColName = xRow->getString(1); // first column is Collation name + OUString sColName = xRow->getString(1); // first column is Collation name return !sColName.isEmpty() && !sColName.endsWith("_ci"); } -rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->db, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->db, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->table, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->table, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->catalog, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->catalog, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); @@ -109,18 +109,18 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) return mysqlc_sdbc_driver::mysqlTypeToStr(pField); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) { checkColumnIndex(column); - rtl::OUString aRet = rtl::OUString(); + OUString aRet = OUString(); return aRet; } @@ -192,13 +192,13 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) unsigned nColCount = mysql_num_fields(m_pRes); if (columnIndex < 1 || columnIndex > static_cast<sal_Int32>(nColCount)) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append("Column index out of range (expected 1 to "); buf.append(sal_Int32(nColCount)); buf.append(", got "); buf.append(columnIndex); buf.append('.'); - throw SQLException(buf.makeStringAndClear(), *this, rtl::OUString(), 1, Any()); + throw SQLException(buf.makeStringAndClear(), *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx index 56ca55c7b025..346695def388 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx @@ -70,25 +70,25 @@ public: sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override; - rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override; + OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + OUString SAL_CALL getColumnName(sal_Int32 column) override; + OUString SAL_CALL getSchemaName(sal_Int32 column) override; sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override; sal_Int32 SAL_CALL getScale(sal_Int32 column) override; - rtl::OUString SAL_CALL getTableName(sal_Int32 column) override; - rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; + OUString SAL_CALL getTableName(sal_Int32 column) override; + OUString SAL_CALL getCatalogName(sal_Int32 column) override; sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; + OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override; sal_Bool SAL_CALL isWritable(sal_Int32 column) override; sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; + OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; /// @throws SQLException /// @throws RuntimeException diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx index 002f4df40272..d23cf66aba06 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx @@ -31,23 +31,23 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; typedef Reference<XSingleServiceFactory> (*createFactoryFunc)( - const Reference<XMultiServiceFactory>& rServiceManager, const rtl::OUString& rComponentName, - ::cppu::ComponentInstantiation pCreateFunction, const Sequence<rtl::OUString>& rServiceNames, + const Reference<XMultiServiceFactory>& rServiceManager, const OUString& rComponentName, + ::cppu::ComponentInstantiation pCreateFunction, const Sequence<OUString>& rServiceNames, rtl_ModuleCount*); struct ProviderRequest { Reference<XSingleServiceFactory> xRet; Reference<XMultiServiceFactory> const xServiceManager; - rtl::OUString const sImplementationName; + OUString const sImplementationName; ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName) : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager)) - , sImplementationName(rtl::OUString::createFromAscii(pImplementationName)) + , sImplementationName(OUString::createFromAscii(pImplementationName)) { } - bool CREATE_PROVIDER(const rtl::OUString& Implname, const Sequence<rtl::OUString>& Services, + bool CREATE_PROVIDER(const OUString& Implname, const Sequence<OUString>& Services, ::cppu::ComponentInstantiation Factory, createFactoryFunc creator) { if (!xRet.is() && (Implname == sImplementationName)) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx index cc6bf1492502..ce970113945f 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx @@ -121,14 +121,14 @@ void SAL_CALL OStatement::clearBatch() // if you support batches clear it here } -sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) +sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - const rtl::OUString sSqlStatement = m_xConnection->transFormPreparedStatement(sql); + const OUString sSqlStatement = m_xConnection->transFormPreparedStatement(sql); - rtl::OString toExec - = rtl::OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); + OString toExec + = OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); MYSQL* pMySql = m_xConnection->getMysqlConnection(); @@ -145,14 +145,13 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) return !failure; } -Reference<XResultSet> SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql) +Reference<XResultSet> SAL_CALL OCommonStatement::executeQuery(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - const rtl::OUString sSqlStatement - = sql; // TODO m_xConnection->transFormPreparedStatement( sql ); - rtl::OString toExec - = rtl::OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); + const OUString sSqlStatement = sql; // TODO m_xConnection->transFormPreparedStatement( sql ); + OString toExec + = OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); MYSQL* pMySql = m_xConnection->getMysqlConnection(); // toExec = mysqlc_sdbc_driver::escapeSql(toExec); @@ -194,7 +193,7 @@ Any SAL_CALL OStatement::queryInterface(const Type& rType) return aRet; } -void SAL_CALL OStatement::addBatch(const rtl::OUString&) +void SAL_CALL OStatement::addBatch(const OUString&) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -209,7 +208,7 @@ Sequence<sal_Int32> SAL_CALL OStatement::executeBatch() return aRet; } -sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -255,7 +254,7 @@ void SAL_CALL OCommonStatement::clearWarnings() Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; pProperties[nPos++] - = Property("CursorName", PROPERTY_ID_CURSORNAME, cppu::UnoType<rtl::OUString>::get(), 0); + = Property("CursorName", PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); pProperties[nPos++] = Property("EscapeProcessing", PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); pProperties[nPos++] = Property("FetchDirection", PROPERTY_ID_FETCHDIRECTION, @@ -328,19 +327,16 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con } } -rtl::OUString OStatement::getImplementationName() -{ - return rtl::OUString("com.sun.star.sdbcx.OStatement"); -} +OUString OStatement::getImplementationName() { return OUString("com.sun.star.sdbcx.OStatement"); } -css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames() +css::uno::Sequence<OUString> OStatement::getSupportedServiceNames() { - css::uno::Sequence<rtl::OUString> s(1); + css::uno::Sequence<OUString> s(1); s[0] = "com.sun.star.sdbc.Statement"; return s; } -sal_Bool OStatement::supportsService(rtl::OUString const& ServiceName) +sal_Bool OStatement::supportsService(OUString const& ServiceName) { return cppu::supportsService(this, ServiceName); } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx index a9e00f915789..9b0d3c952763 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx @@ -111,12 +111,11 @@ public: css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; // XStatement - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL executeQuery(const rtl::OUString& sql) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL executeQuery(const OUString& sql) override; - sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) override; + sal_Int32 SAL_CALL executeUpdate(const OUString& sql) override; - sal_Bool SAL_CALL execute(const rtl::OUString& sql) override; + sal_Bool SAL_CALL execute(const OUString& sql) override; css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection() override; @@ -159,11 +158,11 @@ public: { } - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; Any SAL_CALL queryInterface(const css::uno::Type& rType) override; @@ -171,7 +170,7 @@ public: void SAL_CALL release() throw() override; // XBatchExecution - void SAL_CALL addBatch(const rtl::OUString& sql) override; + void SAL_CALL addBatch(const OUString& sql) override; void SAL_CALL clearBatch() override; diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index c14f13351377..fc085ae9df57 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -82,9 +82,9 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = nullptr; #define SQL_NEW_KEYWORD(token) \ SQLyylval.pParseNode = new OSQLInternalNode("", SQLNodeType::Keyword, (token)); return token; -#define SQL_NEW_INTNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM; -#define SQL_NEW_APPROXNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM; -#define SQL_NEW_DATE SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; +#define SQL_NEW_INTNUM SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM; +#define SQL_NEW_APPROXNUM SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM; +#define SQL_NEW_DATE SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; #define YY_INPUT(buf,result,max_size) \ { \ @@ -422,14 +422,14 @@ YEARDAY {SQL_NEW_KEYWORD(SQL_TOKEN_YEARDAY); } ZONE {SQL_NEW_KEYWORD(SQL_TOKEN_ZONE); } -"<" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;} -">" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;} -"=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;} -"<=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;} -">=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;} -"<>" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} -"!=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} -"||" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;} +"<" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;} +">" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;} +"=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;} +"<=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;} +">=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;} +"<>" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} +"!=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} +"||" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;} [-+*/:(),.;?{}] { return SQLyytext[0]; } @@ -523,7 +523,7 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; } sal_Int32 gatherString(int delim, sal_Int32 nTyp) { int ch; - ::rtl::OStringBuffer sBuffer(256); + OStringBuffer sBuffer(256); while (!checkeof(ch = yyinput())) { @@ -537,13 +537,13 @@ sal_Int32 gatherString(int delim, sal_Int32 nTyp) switch(nTyp) { case 0: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); + SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); return SQL_TOKEN_NAME; case 1: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String); + SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String); return SQL_TOKEN_STRING; case 2: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); + SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; } } @@ -638,7 +638,7 @@ sal_Int32 gatherName(const sal_Char* text) SQL_NEW_KEYWORD(nToken); break; default: - SQL_NEW_NODE(::rtl::OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); + SQL_NEW_NODE(OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); return SQL_TOKEN_NAME; } } @@ -684,17 +684,17 @@ sal_Int32 gatherNamePre(const sal_Char* text) default: // we need a special handling for parameter { - ::rtl::OString sStmt = xxx_pGLOBAL_SQLSCAN->getStatement(); + OString sStmt = xxx_pGLOBAL_SQLSCAN->getStatement(); sal_Int32 nLength = strlen(text); sal_Int32 nPos = xxx_pGLOBAL_SQLSCAN->GetCurrentPos() - nLength - 2; if (sStmt.getStr()[nPos] == ':') { - SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name); + SQL_NEW_NODE(OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name); nToken = SQL_TOKEN_NAME; } else { - SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String); + SQL_NEW_NODE(OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String); nToken = SQL_TOKEN_STRING; } } @@ -728,12 +728,12 @@ void OSQLScanner::SQLyyerror(char const *fmt) IN_SQLyyerror = true; OSL_ENSURE(m_pContext, "OSQLScanner::SQLyyerror: No Context set"); - m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8); + m_sErrorMessage = OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8); if (m_nCurrentPos < m_sStatement.getLength()) { m_sErrorMessage += ": "; - ::rtl::OUString aError; + OUString aError; OUStringBuffer Buffer(256); int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' '; @@ -762,13 +762,13 @@ void OSQLScanner::SQLyyerror(char const *fmt) } //------------------------------------------------------------------------------ -void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, bool bInternational) +void OSQLScanner::prepareScan(const OUString & rNewStatement, const IParseContext* pContext, bool bInternational) { YY_FLUSH_BUFFER; BEGIN(m_nRule); - m_sErrorMessage = ::rtl::OUString(); - m_sStatement = ::rtl::OUStringToOString(rNewStatement, RTL_TEXTENCODING_UTF8); + m_sErrorMessage = OUString(); + m_sStatement = OUStringToOString(rNewStatement, RTL_TEXTENCODING_UTF8); m_nCurrentPos = 0; m_bInternational = bInternational; m_pContext = pContext; @@ -786,7 +786,7 @@ sal_Int32 OSQLScanner::SQLyygetc(void) IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const sal_Char* sToken) const { OSL_ENSURE(m_pContext, "OSQLScanner::getInternationalTokenID: No Context set"); - return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::InternationalKeyCode::None; + return (m_bInternational) ? m_pContext->getIntlKeyCode(OString(sToken) ) : IParseContext::InternationalKeyCode::None; } sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; } sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; } diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index c95c61a905b3..e73a502333f8 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -472,7 +472,7 @@ void Test::testBigStruct() { void Test::testPolyStruct() { CPPUNIT_ASSERT_EQUAL( - rtl::OUString( + OUString( "test.codemaker.cppumaker.Struct<char,short>"), (css::uno::makeAny( test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()). diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 1ee826387191..7787176ffd3b 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -289,9 +289,9 @@ void Test::testVoid() { CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "rtl::OUString", OUString("2"), b ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -303,11 +303,11 @@ void Test::testVoid() { cppu::UnoType<OUString>::get(), b); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", !(a >>= b)); + "css::uno::Sequence<OUString>", !(a >>= b)); CPPUNIT_ASSERT_EQUAL_MESSAGE( - "css::uno::Sequence<rtl::OUString>", sal_Int32(2), b.getLength()); + "css::uno::Sequence<OUString>", sal_Int32(2), b.getLength()); } { Enum1 b = Enum1_M2; @@ -321,7 +321,7 @@ void Test::testVoid() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } @@ -397,9 +397,9 @@ void Test::testBoolean() { CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "rtl::OUString", OUString("2"), b ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -411,12 +411,12 @@ void Test::testBoolean() { cppu::UnoType<OUString>::get(), b); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b)); CPPUNIT_ASSERT_EQUAL_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", sal_Int32(2), b.getLength()); } { @@ -431,7 +431,7 @@ void Test::testBoolean() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b)); CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception1", sal_Int32(2), b.member); } @@ -502,8 +502,8 @@ void Test::testByte() { } } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -512,9 +512,9 @@ void Test::testByte() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -527,7 +527,7 @@ void Test::testByte() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -593,8 +593,8 @@ void Test::testShort() { } } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -603,9 +603,9 @@ void Test::testShort() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -618,7 +618,7 @@ void Test::testShort() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -686,8 +686,8 @@ void Test::testUnsignedShort() { } } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -696,9 +696,9 @@ void Test::testUnsignedShort() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -711,7 +711,7 @@ void Test::testUnsignedShort() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -773,8 +773,8 @@ void Test::testLong() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -783,9 +783,9 @@ void Test::testLong() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -798,7 +798,7 @@ void Test::testLong() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -860,8 +860,8 @@ void Test::testUnsignedLong() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -870,9 +870,9 @@ void Test::testUnsignedLong() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -885,7 +885,7 @@ void Test::testUnsignedLong() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -947,8 +947,8 @@ void Test::testHyper() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -957,9 +957,9 @@ void Test::testHyper() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -972,7 +972,7 @@ void Test::testHyper() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1034,8 +1034,8 @@ void Test::testUnsignedHyper() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1044,9 +1044,9 @@ void Test::testUnsignedHyper() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1059,7 +1059,7 @@ void Test::testUnsignedHyper() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1121,8 +1121,8 @@ void Test::testFloat() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1131,9 +1131,9 @@ void Test::testFloat() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1146,7 +1146,7 @@ void Test::testFloat() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1208,8 +1208,8 @@ void Test::testDouble() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1218,9 +1218,9 @@ void Test::testDouble() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1233,7 +1233,7 @@ void Test::testDouble() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1300,8 +1300,8 @@ void Test::testChar() { } } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1310,9 +1310,9 @@ void Test::testChar() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1325,7 +1325,7 @@ void Test::testChar() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1336,7 +1336,7 @@ void Test::testChar() { } void Test::testString() { - css::uno::Any a(rtl::OUString("1")); + css::uno::Any a(OUString("1")); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<OUString>::get())); { bool b = true; @@ -1387,8 +1387,8 @@ void Test::testString() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", (a >>= b) && b == "1" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1397,9 +1397,9 @@ void Test::testString() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1412,7 +1412,7 @@ void Test::testString() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1474,8 +1474,8 @@ void Test::testType() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1483,9 +1483,9 @@ void Test::testType() { "css::uno::Type", (a >>= b) && b == cppu::UnoType<sal_Int32>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1498,7 +1498,7 @@ void Test::testType() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1563,8 +1563,8 @@ void Test::testSequence() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1573,9 +1573,9 @@ void Test::testSequence() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1594,7 +1594,7 @@ void Test::testSequence() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1656,8 +1656,8 @@ void Test::testEnum() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1666,9 +1666,9 @@ void Test::testEnum() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1685,7 +1685,7 @@ void Test::testEnum() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1747,8 +1747,8 @@ void Test::testStruct() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1757,9 +1757,9 @@ void Test::testStruct() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1785,7 +1785,7 @@ void Test::testStruct() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -1807,7 +1807,7 @@ void Test::testPoly() { void Test::testException() { css::uno::Any a( Exception2a( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 1, + OUString(), css::uno::Reference< css::uno::XInterface >(), 1, 3)); CPPUNIT_ASSERT(bool(a.getValueType() == cppu::UnoType<Exception2a>::get())); { @@ -1859,8 +1859,8 @@ void Test::testException() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1869,9 +1869,9 @@ void Test::testException() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1884,24 +1884,24 @@ void Test::testException() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { Exception2 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception2", (a >>= b) && b.member == 1); } { Exception2a b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2, + OUString(), css::uno::Reference< css::uno::XInterface >(), 2, 2); CPPUNIT_ASSERT_MESSAGE( "Exception2a", (a >>= b) && b.member == 1 && b.member2 == 3); } { Exception2b b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2, + OUString(), css::uno::Reference< css::uno::XInterface >(), 2, 2); CPPUNIT_ASSERT_MESSAGE("Exception2b", !(a >>= b) && b.member == 2); } @@ -1965,8 +1965,8 @@ void Test::testInterface() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -1975,9 +1975,9 @@ void Test::testInterface() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -1990,7 +1990,7 @@ void Test::testInterface() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { @@ -2069,8 +2069,8 @@ void Test::testNull() { CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2'); } { - rtl::OUString b("2"); - CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" ); + OUString b("2"); + CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) && b == "2" ); } { css::uno::Type b(cppu::UnoType<OUString>::get()); @@ -2079,9 +2079,9 @@ void Test::testNull() { !(a >>= b) && b == cppu::UnoType<OUString>::get()); } { - css::uno::Sequence< rtl::OUString > b(2); + css::uno::Sequence< OUString > b(2); CPPUNIT_ASSERT_MESSAGE( - "css::uno::Sequence<rtl::OUString>", + "css::uno::Sequence<OUString>", !(a >>= b) && b.getLength() == 2); } { @@ -2094,7 +2094,7 @@ void Test::testNull() { } { Exception1 b( - rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), 2); + OUString(), css::uno::Reference< css::uno::XInterface >(), 2); CPPUNIT_ASSERT_MESSAGE("Exception1", !(a >>= b) && b.member == 2); } { diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 2a14b3c890d8..1e2a45ac84cf 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -66,7 +66,7 @@ public: virtual void v_enter() override; virtual void v_leave() override; - virtual bool v_isValid(rtl::OUString * pReason) override; + virtual bool v_isValid(OUString * pReason) override; void innerDispatch(); void outerDispatch(bool loop); @@ -311,7 +311,7 @@ void AffineBridge::v_leave() m_innerMutex.release(); } -bool AffineBridge::v_isValid(rtl::OUString * pReason) +bool AffineBridge::v_isValid(OUString * pReason) { bool result = m_enterCount > 0; if (!result) diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index da8b1e64e702..4d7b922e50ce 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -51,7 +51,7 @@ public: virtual void v_enter() override; virtual void v_leave() override; - virtual bool v_isValid(rtl::OUString * pReason) override; + virtual bool v_isValid(OUString * pReason) override; }; LogBridge::LogBridge() @@ -108,7 +108,7 @@ void LogBridge::v_leave() m_mutex.release(); } -bool LogBridge::v_isValid(rtl::OUString * pReason) +bool LogBridge::v_isValid(OUString * pReason) { bool result = m_count > 0; if (!result) @@ -134,7 +134,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason) switch(_pTypeRef->eTypeClass) { case typelib_TypeClass_STRING: - SAL_INFO("cppu.log", "" << *static_cast< ::rtl::OUString*>(pArg)); + SAL_INFO("cppu.log", "" << *static_cast< OUString*>(pArg)); break; case typelib_TypeClass_BOOLEAN: SAL_INFO("cppu.log", "" << *static_cast<sal_Bool*>(pArg)); @@ -201,9 +201,9 @@ static void LogProbe( void * pArgs[], uno_Any ** ppException ) { - ::rtl::OString sTemp; + OString sTemp; if ( pMemberType && pMemberType->pTypeName ) - sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); + sTemp = OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); if ( pre ) { SAL_INFO("cppu.log", "{ LogBridge () " << sTemp ); diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 892390b7a263..7cf945d44391 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -43,7 +43,7 @@ public: virtual void v_enter() override; virtual void v_leave() override; - virtual bool v_isValid(rtl::OUString * pReason) override; + virtual bool v_isValid(OUString * pReason) override; }; UnsafeBridge::UnsafeBridge() @@ -103,7 +103,7 @@ void UnsafeBridge::v_leave() m_mutex.release(); } -bool UnsafeBridge::v_isValid(rtl::OUString * pReason) +bool UnsafeBridge::v_isValid(OUString * pReason) { bool result = m_count > 0; if (!result) diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index f53702ef93d3..6f99ee7d42be 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -42,7 +42,7 @@ class Proxy : public uno_Interface // mapping information uno_Interface * m_pUnoI; // wrapped interface typelib_InterfaceTypeDescription * m_pTypeDescr; - rtl::OUString m_aOId; + OUString m_aOId; cppu::helper::purpenv::ProbeFun * m_probeFun; void * m_pProbeContext; @@ -53,7 +53,7 @@ public: uno_Environment * pFrom, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr, - rtl::OUString const & rOId, + OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext); ~Proxy(); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index 9bead78d0ce0..ceeee6eb0deb 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -72,19 +72,19 @@ public: void registerProxyInterface (void ** ppProxy, uno_freeProxyFunc freeProxy, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr); void revokeInterface (void * pInterface); void getObjectIdentifier (void * pInterface, - rtl::OUString * pOid); + OUString * pOid); void getRegisteredInterface (void **, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription *); void getRegisteredInterfaces(void ***, sal_Int32 * pnLen, uno_memAlloc memAlloc); void computeObjectIdentifier(void * pInterface, - rtl::OUString * pOid); + OUString * pOid); void acquireInterface (void * pInterface); void releaseInterface (void * pInterface); @@ -92,7 +92,7 @@ public: virtual void v_leave() override; virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override; - virtual bool v_isValid (rtl::OUString * pReason) override; + virtual bool v_isValid (OUString * pReason) override; protected: oslInterlockedCount m_nRef; @@ -170,7 +170,7 @@ static void s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); - pBase->getObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId)); + pBase->getObjectIdentifier(pInterface, reinterpret_cast<OUString *>(ppOId)); } static void s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, @@ -196,7 +196,7 @@ static void s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast<Base *>(pExtEnv->aBase.pReserved); - pBase->computeObjectIdentifier(pInterface, reinterpret_cast<rtl::OUString *>(ppOId)); + pBase->computeObjectIdentifier(pInterface, reinterpret_cast<OUString *>(ppOId)); } static void s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { @@ -317,7 +317,7 @@ extern "C" { static void s_registerProxyInterface_v(va_list * pParam) void Base::registerProxyInterface(void ** ppProxy, uno_freeProxyFunc freeProxy, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr) { uno_Environment_invoke(m_pEnv, @@ -354,14 +354,14 @@ extern "C" { static void s_getObjectIdentifier_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); - rtl::OUString * pOId = va_arg(*pParam, rtl::OUString *); + OUString * pOId = va_arg(*pParam, OUString *); ExtEnv_getObjectIdentifier * pGetObjectIdentifier = va_arg(*pParam, ExtEnv_getObjectIdentifier *); pGetObjectIdentifier(pExtEnv, reinterpret_cast<rtl_uString **>(pOId), pInterface); }} -void Base::getObjectIdentifier(void * pInterface, rtl::OUString * pOid) +void Base::getObjectIdentifier(void * pInterface, OUString * pOid) { uno_Environment_invoke(m_pEnv, s_getObjectIdentifier_v, @@ -385,7 +385,7 @@ extern "C" { static void s_getRegisteredInterface_v(va_list * pParam) }} void Base::getRegisteredInterface(void ** ppInterface, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr) { uno_Environment_invoke(m_pEnv, @@ -428,14 +428,14 @@ extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); - rtl::OUString * pOId = va_arg(*pParam, rtl::OUString *); + OUString * pOId = va_arg(*pParam, OUString *); ExtEnv_computeObjectIdentifier * pComputeObjectIdentifier = va_arg(*pParam, ExtEnv_computeObjectIdentifier *); pComputeObjectIdentifier(pExtEnv, reinterpret_cast<rtl_uString **>(pOId), pInterface); }} -void Base::computeObjectIdentifier(void * pInterface, rtl::OUString * pOid) +void Base::computeObjectIdentifier(void * pInterface, OUString * pOid) { uno_Environment_invoke(m_pEnv, s_computeObjectIdentifier_v, @@ -501,7 +501,7 @@ void Base::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) m_pEnterable->callOut_v(pCallee, pParam); } -bool Base::v_isValid(rtl::OUString * pReason) +bool Base::v_isValid(OUString * pReason) { return m_pEnterable->isValid(pReason); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 7ee3a4dadb0d..a781ff1d7796 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -195,7 +195,7 @@ Proxy::Proxy(uno::Mapping const & to_from, uno_Environment * pFrom, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr, - rtl::OUString const & rOId, + OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext ) diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index b5c839b193cd..ed8891fabf8f 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -239,7 +239,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( // release inout parameter if (*ppCurrentContext) { - target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); + target_env = Environment(OUString(pEnvTypeName), pEnvContext); OSL_ASSERT( target_env.is() ); if (! target_env.is()) return false; @@ -258,7 +258,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( if (! target_env.is()) { - target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); + target_env = Environment(OUString(pEnvTypeName), pEnvContext); OSL_ASSERT( target_env.is() ); if (! target_env.is()) return false; diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index fe16b365b7f3..2ccac42f5df1 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -35,9 +35,6 @@ using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; - extern "C" { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 1c8f17761cb8..ccfe85c9abe7 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -44,10 +44,6 @@ using namespace std; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; - #ifdef _WIN32 #pragma pack(push, 8) #endif @@ -292,7 +288,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() typelib_TypeDescriptionReference * pTDR = (*aIt).second; if (pTDR) { - OString aTypeName( rtl::OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) ); + OString aTypeName( OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) ); SAL_INFO("cppu.typelib", "remaining type: " << aTypeName << "; ref count = " << pTDR->nRefCount); } else @@ -749,7 +745,7 @@ void newTypeDescription( pTmp->ppTypeRefs = new typelib_TypeDescriptionReference *[ nMembers ]; pTmp->ppMemberNames = new rtl_uString *[ nMembers ]; bool polymorphic = eTypeClass == typelib_TypeClass_STRUCT - && rtl::OUString::unacquired(&pTypeName).indexOf('<') >= 0; + && OUString::unacquired(&pTypeName).indexOf('<') >= 0; OSL_ASSERT(!polymorphic || pStructMembers != nullptr); if (polymorphic) { reinterpret_cast< typelib_StructTypeDescription * >(pTmp)-> @@ -915,7 +911,7 @@ public: sal_Int32 getBaseMembers() const { return members; } private: - typedef std::set< rtl::OUString > Set; + typedef std::set< OUString > Set; void calculate( sal_Int32 directBaseIndex, Set & directBaseSet, @@ -1035,14 +1031,14 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface( for (sal_Int32 j = 0; j < pBase->nMembers; ++j) { typelib_TypeDescriptionReference const * pDirectBaseMember = pDirectBase->ppAllMembers[i->directBaseMemberOffset + j]; - rtl::OUStringBuffer aBuf(pDirectBaseMember->pTypeName); + OUStringBuffer aBuf(pDirectBaseMember->pTypeName); aBuf.append(":@"); aBuf.append(i->directBaseIndex); aBuf.append(','); aBuf.append(i->memberOffset + j); aBuf.append(':'); aBuf.append(pITD->aBase.pTypeName); - rtl::OUString aName(aBuf.makeStringAndClear()); + OUString aName(aBuf.makeStringAndClear()); typelib_TypeDescriptionReference * pDerivedMember = nullptr; typelib_typedescriptionreference_new( &pDerivedMember, pDirectBaseMember->eTypeClass, @@ -1119,7 +1115,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( OSL_FAIL("Bad interface method type name"); return; } - rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); + OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); typelib_InterfaceTypeDescription * pInterface = nullptr; typelib_typedescription_getByName( reinterpret_cast< typelib_TypeDescription ** >(&pInterface), @@ -1211,7 +1207,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( OSL_FAIL("Bad interface attribute type name"); return; } - rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); + OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); typelib_InterfaceTypeDescription * pInterface = nullptr; typelib_typedescription_getByName( reinterpret_cast< typelib_TypeDescription ** >(&pInterface), @@ -1753,7 +1749,7 @@ typelib_TypeDescriptionReference ** copyExceptions( } bool createDerivedInterfaceMemberDescription( - typelib_TypeDescription ** result, rtl::OUString const & name, + typelib_TypeDescription ** result, OUString const & name, typelib_TypeDescriptionReference * baseRef, typelib_TypeDescription const * base, typelib_TypeDescription * interface, sal_Int32 index, sal_Int32 position) diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 4a2fd8146328..9907011987f9 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -111,7 +111,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl *ppEnv = nullptr; } - rtl::OUString currPurpose; + OUString currPurpose; uno_Environment * pCurrEnv = s_getCurrent(); if (pCurrEnv) // no environment means no purpose @@ -119,7 +119,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl if (pTypeName && rtl_uString_getLength(pTypeName)) { - rtl::OUString envDcp(pTypeName); + OUString envDcp(pTypeName); envDcp += currPurpose; uno_getEnvironment(ppEnv, envDcp.pData, nullptr); @@ -133,20 +133,20 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl } else { - rtl::OUString uno_envDcp(UNO_LB_UNO); + OUString uno_envDcp(UNO_LB_UNO); uno_getEnvironment(ppEnv, uno_envDcp.pData, nullptr); } } } -static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const & str2) +static OUString s_getPrefix(OUString const & str1, OUString const & str2) { sal_Int32 nIndex1 = 0; sal_Int32 nIndex2 = 0; sal_Int32 sim = 0; - rtl::OUString token1; - rtl::OUString token2; + OUString token1; + OUString token2; do { @@ -158,7 +158,7 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const } while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2); - rtl::OUString result; + OUString result; if (sim) result = str1.copy(0, sim - 1); @@ -170,17 +170,17 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un { int res = 0; - rtl::OUString nextPurpose; + OUString nextPurpose; - rtl::OUString currPurpose; + OUString currPurpose; if (pCurrEnv) currPurpose = cppu::EnvDcp::getPurpose(pCurrEnv->pTypeName); - rtl::OUString targetPurpose; + OUString targetPurpose; if (pTargetEnv) targetPurpose = cppu::EnvDcp::getPurpose(pTargetEnv->pTypeName); - rtl::OUString intermPurpose(s_getPrefix(currPurpose, targetPurpose)); + OUString intermPurpose(s_getPrefix(currPurpose, targetPurpose)); if (currPurpose.getLength() > intermPurpose.getLength()) { sal_Int32 idx = currPurpose.lastIndexOf(':'); @@ -202,7 +202,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un if (!nextPurpose.isEmpty()) { - rtl::OUString next_envDcp(UNO_LB_UNO); + OUString next_envDcp(UNO_LB_UNO); next_envDcp += nextPurpose; uno_getEnvironment(ppEnv, next_envDcp.pData, nullptr); @@ -360,21 +360,21 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea { int result = 1; - rtl::OUString typeName(cppu::EnvDcp::getTypeName(pEnv->pTypeName)); + OUString typeName(cppu::EnvDcp::getTypeName(pEnv->pTypeName)); if (typeName == UNO_LB_UNO) { cppu::Enterable * pEnterable = static_cast<cppu::Enterable *>(pEnv->pReserved); if (pEnterable) - result = pEnterable->isValid(reinterpret_cast<rtl::OUString *>(pReason)); + result = pEnterable->isValid(reinterpret_cast<OUString *>(pReason)); } else { - rtl::OUString envDcp(UNO_LB_UNO); + OUString envDcp(UNO_LB_UNO); envDcp += cppu::EnvDcp::getPurpose(pEnv->pTypeName); uno::Environment env(envDcp); - result = env.isValid(reinterpret_cast<rtl::OUString *>(pReason)); + result = env.isValid(reinterpret_cast<OUString *>(pReason)); } return result; diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 36f0d15192c4..6b7ad09f98c6 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -46,7 +46,7 @@ static void s_free(uno_Mapping * pMapping) static void s_acquire(uno_Mapping * pMapping) { - static rtl::OUString s_purpose; + static OUString s_purpose; if (1 == osl_atomic_increment(&static_cast<IdentityMapping *>(pMapping)->m_nRef)) { diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 60a8704e8347..3cb34a65bb1c 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -151,14 +151,14 @@ extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping) }} -static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & str2) +static OUString getPrefix(OUString const & str1, OUString const & str2) { sal_Int32 nIndex1 = 0; sal_Int32 nIndex2 = 0; sal_Int32 sim = 0; - rtl::OUString token1; - rtl::OUString token2; + OUString token1; + OUString token2; do { @@ -170,7 +170,7 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & } while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2); - rtl::OUString result; + OUString result; if (sim) result = str1.copy(0, sim - 1); @@ -178,12 +178,12 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & return result; } -// rtl::OUString str1("abc:def:ghi"); -// rtl::OUString str2("abc:def"); -// rtl::OUString str3("abc"); -// rtl::OUString str4(""); +// OUString str1("abc:def:ghi"); +// OUString str2("abc:def"); +// OUString str3("abc"); +// OUString str4(""); -// rtl::OUString pref; +// OUString pref; // pref = getPrefix(str1, str1); // pref = getPrefix(str1, str2); @@ -203,16 +203,16 @@ void getCascadeMapping(uno_Mapping ** ppMapping, if (pAddPurpose && pAddPurpose->length) return; - rtl::OUString uno_envType(UNO_LB_UNO); + OUString uno_envType(UNO_LB_UNO); - rtl::OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName); - rtl::OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName); - rtl::OUString from_envPurpose = cppu::EnvDcp::getPurpose(pFrom->pTypeName); - rtl::OUString to_envPurpose = cppu::EnvDcp::getPurpose(pTo->pTypeName); + OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName); + OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName); + OUString from_envPurpose = cppu::EnvDcp::getPurpose(pFrom->pTypeName); + OUString to_envPurpose = cppu::EnvDcp::getPurpose(pTo->pTypeName); #ifdef LOG_CALLING_named_purpose_getMapping - rtl::OString s_from_name = rtl::OUStringToOString(pFrom->pTypeName, RTL_TEXTENCODING_ASCII_US); - rtl::OString s_to_name = rtl::OUStringToOString(pTo->pTypeName, RTL_TEXTENCODING_ASCII_US); + OString s_from_name = OUStringToOString(pFrom->pTypeName, RTL_TEXTENCODING_ASCII_US); + OString s_to_name = OUStringToOString(pTo->pTypeName, RTL_TEXTENCODING_ASCII_US); std::cerr << __FUNCTION__ << " - creating mediation "; std::cerr << "pFrom: " << s_from_name.getStr(); @@ -229,16 +229,16 @@ void getCascadeMapping(uno_Mapping ** ppMapping, // chained uno -> uno if (from_envType == uno_envType && to_envType == uno_envType) { - rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose); + OUString purpose = getPrefix(from_envPurpose, to_envPurpose); - rtl::OUString uno_envDcp = uno_envType; + OUString uno_envDcp = uno_envType; uno_envDcp += purpose; // direct mapping possible? // uno:bla-->uno:bla:blubb if (from_envPurpose == purpose) { - rtl::OUString rest = to_envPurpose.copy(purpose.getLength()); + OUString rest = to_envPurpose.copy(purpose.getLength()); sal_Int32 index = rest.indexOf(':', 1); if (index == -1) @@ -251,7 +251,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, } else if (to_envPurpose == purpose) { - rtl::OUString rest = from_envPurpose.copy(purpose.getLength()); + OUString rest = from_envPurpose.copy(purpose.getLength()); sal_Int32 index = rest.indexOf(':', 1); if (index == -1) @@ -268,7 +268,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else if (from_envType != uno_envType && to_envType == uno_envType) // <ANY> -> UNO ? // mediate via uno:purpose(fromEnv) { - rtl::OUString envDcp = uno_envType; + OUString envDcp = uno_envType; envDcp += from_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, nullptr); @@ -276,7 +276,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else if (from_envType == uno_envType && to_envType != uno_envType) // UNO -> <ANY>? // mediate via uno(context) { - rtl::OUString envDcp = uno_envType; + OUString envDcp = uno_envType; envDcp += to_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, nullptr); @@ -284,9 +284,9 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else // everything else // mediate via uno:purpose { - rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose); + OUString purpose = getPrefix(from_envPurpose, to_envPurpose); - rtl::OUString uno_envDcp = uno_envType; + OUString uno_envDcp = uno_envType; uno_envDcp += purpose; uno_getEnvironment(&pInterm, uno_envDcp.pData, nullptr); diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index df0be91ed0b1..a2191a34222f 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -166,7 +166,7 @@ inline bool _equalSequence( { for ( sal_Int32 nPos = nElements; nPos--; ) { - if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] ) + if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const OUString *>(pSourceElements)[nPos] ) return false; } return true; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index d442ca0bc7d7..a336dd33eaf8 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -45,8 +45,6 @@ #include <stdio.h> -using ::rtl::OUString; - namespace { @@ -677,7 +675,7 @@ void writeLine( void writeLine( void * stream, const OUString & rLine, const sal_Char * pFilter ) { - ::rtl::OString aLine( ::rtl::OUStringToOString( + OString aLine( OUStringToOString( rLine, RTL_TEXTENCODING_ASCII_US ) ); writeLine( stream, aLine.getStr(), pFilter ); } @@ -689,7 +687,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( SAL_THROW_EXTERN_C() { OSL_ENSURE( pEnv, "### null ptr!" ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (! pEnv->pExtEnv) { @@ -781,7 +779,7 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName( } else { - ::rtl::OUStringBuffer buf( 32 ); + OUStringBuffer buf( 32 ); buf.append( "environment \"" ); buf.append( pEnvDcp ); buf.append( "\" does not exist!" ); @@ -798,7 +796,7 @@ namespace public: makeOIdPart() { - ::rtl::OUStringBuffer aRet( 64 ); + OUStringBuffer aRet( 64 ); aRet.append( "];" ); // pid oslProcessInfo info; @@ -855,7 +853,7 @@ static void unoenv_computeObjectIdentifier( { (*pUnoI->release)( pUnoI ); // interface - ::rtl::OUStringBuffer oid( 64 ); + OUStringBuffer oid( 64 ); oid.append( reinterpret_cast< sal_Int64 >(pUnoI), 16 ); oid.append( ';' ); // environment[context] @@ -1084,7 +1082,7 @@ static uno_Environment * initDefaultEnvironment( OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp); if (!envPurpose.isEmpty()) { - rtl::OUString libStem( + OUString libStem( envPurpose.copy(envPurpose.lastIndexOf(':') + 1) + "_uno_uno"); if(!loadEnv(libStem, pEnv)) { diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index c203523efa2c..b5fdf82ac0f6 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -48,8 +48,6 @@ using namespace std; using namespace osl; using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace cppu { diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx index ef8e65a7ffb9..c72de19be33d 100644 --- a/cppu/source/uno/loadmodule.cxx +++ b/cppu/source/uno/loadmodule.cxx @@ -31,8 +31,8 @@ namespace cppu { namespace detail { #ifndef DISABLE_DYNLOADING -bool loadModule(osl::Module& rModule, rtl::OUString const & name) { - rtl::OUStringBuffer b; +bool loadModule(osl::Module& rModule, OUString const & name) { + OUStringBuffer b; #if defined SAL_DLLPREFIX b.append(SAL_DLLPREFIX); #endif diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index 9021118477d6..8a964e088174 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -37,7 +37,7 @@ namespace cppu { namespace detail { @return false if the module could not be loaded, otherwise true */ -bool loadModule(osl::Module & rModule, ::rtl::OUString const & name); +bool loadModule(osl::Module & rModule, OUString const & name); #endif diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 2a4bc64ab703..5df856146063 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -209,7 +209,7 @@ namespace cppu_ifcontainer ::cppu::UnoType< ::sal_uInt32 >::get(), ::cppu::UnoType< ::sal_Int32 >::get(), ::cppu::UnoType< ::sal_Int16 >::get(), - ::cppu::UnoType< ::rtl::OUString >::get(), + ::cppu::UnoType< OUString >::get(), ::cppu::UnoType< ::sal_Int8 >::get() }; doContainerTest< cppu::OMultiTypeInterfaceContainerHelper, diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index 5e8ce06b7ef0..2447c816522f 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -63,7 +63,7 @@ public: css::uno::Reference< css::uno::XComponentContext > const & context): cppu::PropertySetMixin< css::lang::XComponent >( context, static_cast< Implements >(0), - css::uno::Sequence< rtl::OUString >()) + css::uno::Sequence< OUString >()) {} virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) @@ -121,7 +121,7 @@ public: static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS), - css::uno::Sequence< rtl::OUString >()) + css::uno::Sequence< OUString >()) {} virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) @@ -167,8 +167,8 @@ css::uno::Any Empty2::queryInterface(css::uno::Type const & type) type); } -css::uno::Sequence< rtl::OUString > sequenceThird() { - css::uno::Sequence<OUString> s { rtl::OUString("Third") }; +css::uno::Sequence< OUString > sequenceThird() { + css::uno::Sequence<OUString> s { OUString("Third") }; return s; } @@ -273,7 +273,7 @@ sal_Int32 Full::getFirst() throw (css::uno::RuntimeException) { void Full::setFirst(sal_Int32 value) throw (css::uno::RuntimeException) { prepareSet( - rtl::OUString("First"), css::uno::Any(), + OUString("First"), css::uno::Any(), css::uno::Any(), 0); osl::MutexGuard g(m_mutex); m_a1 = value; @@ -302,7 +302,7 @@ void Full::setSecond( } BoundListeners l; prepareSet( - rtl::OUString("Second"), css::uno::Any(), + OUString("Second"), css::uno::Any(), v, &l); { osl::MutexGuard g(m_mutex); @@ -315,7 +315,7 @@ sal_Int32 Full::getThird() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString("Third"), + OUString("Third"), static_cast< cppu::OWeakObject * >(this)); } @@ -323,7 +323,7 @@ void Full::setThird(sal_Int32) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString("Third"), + OUString("Third"), static_cast< cppu::OWeakObject * >(this)); } @@ -331,7 +331,7 @@ sal_Int32 Full::getFourth() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString("Fourth"), + OUString("Fourth"), static_cast< cppu::OWeakObject * >(this)); } @@ -339,7 +339,7 @@ void Full::setFourth(sal_Int32) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { throw css::beans::UnknownPropertyException( - rtl::OUString("Fourth"), + OUString("Fourth"), static_cast< cppu::OWeakObject * >(this)); } @@ -379,14 +379,14 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Supplier(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( +OUString SAL_CALL getImplementationName() { + return OUString( "test.cppuhelper.propertysetmixin.comp.CppSupplier"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > s { "test.cppuhelper.propertysetmixin.CppSupplier") }; + css::uno::Sequence< OUString > s { "test.cppuhelper.propertysetmixin.CppSupplier") }; return s; } diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 5fa8cd1794ce..cff87436ce2c 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -68,8 +68,8 @@ namespace com { namespace sun { namespace star { namespace { -std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) { - return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr(); +std::ostream & operator <<(std::ostream & out, OUString const & value) { + return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr(); } std::ostream & operator <<(std::ostream & out, css::uno::Type const & value) { @@ -254,34 +254,34 @@ void Test::testEmpty2( static_cast< sal_Int32 >(0), info->getProperties().getLength()); try { info->getPropertyByName( - rtl::OUString("any")); + OUString("any")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} CPPUNIT_ASSERT( !info->hasPropertyByName( - rtl::OUString("any"))); + OUString("any"))); try { empty2p->setPropertyValue( - rtl::OUString("any"), css::uno::Any()); + OUString("any"), css::uno::Any()); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { empty2p->getPropertyValue( - rtl::OUString("any")); + OUString("any")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} rtl::Reference< BoundListener > boundListener1(new BoundListener); - empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get()); - empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get()); + empty2p->addPropertyChangeListener(OUString(), boundListener1.get()); + empty2p->addPropertyChangeListener(OUString(), boundListener1.get()); rtl::Reference< BoundListener > boundListener2(new BoundListener); empty2p->removePropertyChangeListener( - rtl::OUString(), boundListener2.get()); + OUString(), boundListener2.get()); rtl::Reference< VetoListener > vetoListener1(new VetoListener); - empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get()); - empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get()); + empty2p->addVetoableChangeListener(OUString(), vetoListener1.get()); + empty2p->addVetoableChangeListener(OUString(), vetoListener1.get()); rtl::Reference< VetoListener > vetoListener2(new VetoListener); - empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener2.get()); - empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener2.get()); + empty2p->addVetoableChangeListener(OUString(), vetoListener2.get()); + empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get()); css::uno::Reference< css::beans::XFastPropertySet > empty2f( empty2, css::uno::UNO_QUERY); CPPUNIT_ASSERT(empty2f.is()); @@ -309,10 +309,10 @@ void Test::testEmpty2( empty2a->setPropertyValues( css::uno::Sequence< css::beans::PropertyValue >()); css::uno::Sequence< css::beans::PropertyValue > vs(2); - vs[0].Name = rtl::OUString("any1"); + vs[0].Name = OUString("any1"); vs[0].Handle = -1; vs[0].State = css::beans::PropertyState_DIRECT_VALUE; - vs[0].Name = rtl::OUString("any2"); + vs[0].Name = OUString("any2"); vs[0].Handle = -1; vs[0].State = css::beans::PropertyState_DIRECT_VALUE; try { @@ -329,23 +329,23 @@ void Test::testEmpty2( CPPUNIT_ASSERT_EQUAL(2, vetoListener1->count()); CPPUNIT_ASSERT_EQUAL(0, vetoListener2->count()); empty2p->removePropertyChangeListener( - rtl::OUString(), boundListener1.get()); + OUString(), boundListener1.get()); empty2p->removePropertyChangeListener( - rtl::OUString(), boundListener2.get()); - empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener1.get()); - empty2p->removeVetoableChangeListener(rtl::OUString(), vetoListener2.get()); - empty2p->addPropertyChangeListener(rtl::OUString(), boundListener1.get()); - empty2p->addPropertyChangeListener(rtl::OUString(), boundListener2.get()); - empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener1.get()); - empty2p->addVetoableChangeListener(rtl::OUString(), vetoListener2.get()); + OUString(), boundListener2.get()); + empty2p->removeVetoableChangeListener(OUString(), vetoListener1.get()); + empty2p->removeVetoableChangeListener(OUString(), vetoListener2.get()); + empty2p->addPropertyChangeListener(OUString(), boundListener1.get()); + empty2p->addPropertyChangeListener(OUString(), boundListener2.get()); + empty2p->addVetoableChangeListener(OUString(), vetoListener1.get()); + empty2p->addVetoableChangeListener(OUString(), vetoListener2.get()); try { empty2p->addPropertyChangeListener( - rtl::OUString(), + OUString(), css::uno::Reference< css::beans::XPropertyChangeListener >()); } catch (css::uno::RuntimeException &) {} try { empty2p->addVetoableChangeListener( - rtl::OUString(), + OUString(), css::uno::Reference< css::beans::XVetoableChangeListener >()); } catch (css::uno::RuntimeException &) {} CPPUNIT_ASSERT_EQUAL(3, boundListener1->count()); @@ -370,16 +370,16 @@ void Test::testFull( static_cast< sal_Int32 >(3), info->getProperties().getLength()); css::beans::Property prop( info->getPropertyByName( - rtl::OUString("First"))); + OUString("First"))); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("First"), prop.Name); + OUString("First"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), prop.Handle); CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), prop.Attributes); prop = info->getPropertyByName( - rtl::OUString("Second")); + OUString("Second")); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("Second"), prop.Name); + OUString("Second"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), prop.Handle); CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type); CPPUNIT_ASSERT_EQUAL( @@ -393,13 +393,13 @@ void Test::testFull( prop.Attributes); try { info->getPropertyByName( - rtl::OUString("Third")); + OUString("Third")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} prop = info->getPropertyByName( - rtl::OUString("Fourth")); + OUString("Fourth")); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("Fourth"), prop.Name); + OUString("Fourth"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(3), prop.Handle); CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type); CPPUNIT_ASSERT_EQUAL( @@ -407,93 +407,93 @@ void Test::testFull( prop.Attributes); try { info->getPropertyByName( - rtl::OUString("first")); + OUString("first")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} CPPUNIT_ASSERT( info->hasPropertyByName( - rtl::OUString("First"))); + OUString("First"))); CPPUNIT_ASSERT( info->hasPropertyByName( - rtl::OUString("Second"))); + OUString("Second"))); CPPUNIT_ASSERT( !info->hasPropertyByName( - rtl::OUString("Third"))); + OUString("Third"))); CPPUNIT_ASSERT( info->hasPropertyByName( - rtl::OUString("Fourth"))); + OUString("Fourth"))); CPPUNIT_ASSERT( !info->hasPropertyByName( - rtl::OUString("first"))); + OUString("first"))); CPPUNIT_ASSERT_EQUAL( css::uno::Any(static_cast< sal_Int32 >(0)), fullp->getPropertyValue( - rtl::OUString("First"))); + OUString("First"))); fullp->setPropertyValue( - rtl::OUString("First"), + OUString("First"), css::uno::Any(static_cast< sal_Int32 >(-100))); CPPUNIT_ASSERT_EQUAL( css::uno::Any(static_cast< sal_Int32 >(-100)), fullp->getPropertyValue( - rtl::OUString("First"))); + OUString("First"))); css::uno::Any voidAny; CPPUNIT_ASSERT_EQUAL( voidAny, fullp->getPropertyValue( - rtl::OUString("Second"))); + OUString("Second"))); fullp->setPropertyValue( - rtl::OUString("Second"), + OUString("Second"), css::uno::Any(static_cast< sal_Int32 >(100))); CPPUNIT_ASSERT_EQUAL( css::uno::Any(static_cast< sal_Int32 >(100)), fullp->getPropertyValue( - rtl::OUString("Second"))); + OUString("Second"))); CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int32 >(100), full->getSecond().Value.Value.Value); CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted); CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous); fullp->setPropertyValue( - rtl::OUString("Second"), + OUString("Second"), css::uno::Any()); CPPUNIT_ASSERT_EQUAL( voidAny, fullp->getPropertyValue( - rtl::OUString("Second"))); + OUString("Second"))); CPPUNIT_ASSERT(!full->getSecond().Value.Value.IsPresent); CPPUNIT_ASSERT(!full->getSecond().Value.IsDefaulted); CPPUNIT_ASSERT(!full->getSecond().IsAmbiguous); try { fullp->setPropertyValue( - rtl::OUString("Third"), + OUString("Third"), css::uno::Any(static_cast< sal_Int32 >(100))); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->getPropertyValue( - rtl::OUString("Third")); + OUString("Third")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->setPropertyValue( - rtl::OUString("Fourth"), + OUString("Fourth"), css::uno::Any(static_cast< sal_Int32 >(100))); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->getPropertyValue( - rtl::OUString("Fourth")); + OUString("Fourth")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->setPropertyValue( - rtl::OUString("first"), + OUString("first"), css::uno::Any()); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->getPropertyValue( - rtl::OUString("first")); + OUString("first")); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} css::uno::Reference< css::beans::XFastPropertySet > fullf( @@ -520,13 +520,13 @@ void Test::testFull( fulla->getPropertyValues()); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength()); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("First"), vs[0].Name); + OUString("First"), vs[0].Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), vs[0].Handle); CPPUNIT_ASSERT_EQUAL( css::uno::Any(static_cast< sal_Int32 >(0)), vs[0].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("Second"), vs[1].Name); + OUString("Second"), vs[1].Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), vs[1].Handle); CPPUNIT_ASSERT_EQUAL(voidAny, vs[1].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[1].State); @@ -537,12 +537,12 @@ void Test::testFull( vs = fulla->getPropertyValues(); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(2), vs.getLength()); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("First"), vs[0].Name); + OUString("First"), vs[0].Name); CPPUNIT_ASSERT_EQUAL( css::uno::Any(static_cast< sal_Int32 >(-100)), vs[0].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State); CPPUNIT_ASSERT_EQUAL( - rtl::OUString("Second"), vs[1].Name); + OUString("Second"), vs[1].Name); CPPUNIT_ASSERT_EQUAL( css::uno::Any(static_cast< sal_Int32 >(100)), vs[1].Value); CPPUNIT_ASSERT_EQUAL( @@ -555,76 +555,76 @@ void Test::testFull( css::uno::Reference< css::beans::XPropertyChangeListener > boundListener( new BoundListener); fullp->addPropertyChangeListener( - rtl::OUString("First"), boundListener); + OUString("First"), boundListener); fullp->removePropertyChangeListener( - rtl::OUString("First"), boundListener); + OUString("First"), boundListener); fullp->addPropertyChangeListener( - rtl::OUString("Second"), boundListener); + OUString("Second"), boundListener); fullp->removePropertyChangeListener( - rtl::OUString("Second"), boundListener); + OUString("Second"), boundListener); try { fullp->addPropertyChangeListener( - rtl::OUString("Third"), + OUString("Third"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removePropertyChangeListener( - rtl::OUString("Third"), + OUString("Third"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} fullp->addPropertyChangeListener( - rtl::OUString("Fourth"), boundListener); + OUString("Fourth"), boundListener); fullp->removePropertyChangeListener( - rtl::OUString("Fourth"), boundListener); + OUString("Fourth"), boundListener); try { fullp->addPropertyChangeListener( - rtl::OUString("Fifth"), + OUString("Fifth"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removePropertyChangeListener( - rtl::OUString("Fifth"), + OUString("Fifth"), boundListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} css::uno::Reference< css::beans::XVetoableChangeListener > vetoListener( new VetoListener); fullp->addVetoableChangeListener( - rtl::OUString("First"), vetoListener); + OUString("First"), vetoListener); fullp->removeVetoableChangeListener( - rtl::OUString("First"), vetoListener); + OUString("First"), vetoListener); fullp->addVetoableChangeListener( - rtl::OUString("Second"), vetoListener); + OUString("Second"), vetoListener); fullp->removeVetoableChangeListener( - rtl::OUString("Second"), vetoListener); + OUString("Second"), vetoListener); try { fullp->addVetoableChangeListener( - rtl::OUString("Third"), + OUString("Third"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removeVetoableChangeListener( - rtl::OUString("Third"), + OUString("Third"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} fullp->addVetoableChangeListener( - rtl::OUString("Fourth"), vetoListener); + OUString("Fourth"), vetoListener); fullp->removeVetoableChangeListener( - rtl::OUString("Fourth"), vetoListener); + OUString("Fourth"), vetoListener); try { fullp->addVetoableChangeListener( - rtl::OUString("Fifth"), + OUString("Fifth"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { fullp->removeVetoableChangeListener( - rtl::OUString("Fifth"), + OUString("Fifth"), vetoListener); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index c9883993f37a..90f193620d87 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -75,7 +75,7 @@ namespace cppu_unourl bool bValid = false; try { - cppu::UnoUrlDescriptor aDescriptor(rtl::OUString::createFromAscii( + cppu::UnoUrlDescriptor aDescriptor(OUString::createFromAscii( aTests[i].pInput)); (void)aDescriptor; bValid = true; @@ -123,10 +123,10 @@ namespace cppu_unourl for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i) { bool bValid = false; - rtl::OUString aDescriptor; + OUString aDescriptor; try { - aDescriptor = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii( + aDescriptor = cppu::UnoUrlDescriptor(OUString::createFromAscii( aTests[i].pInput)). getDescriptor(); bValid = true; @@ -171,10 +171,10 @@ namespace cppu_unourl for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i) { bool bValid = false; - rtl::OUString aName; + OUString aName; try { - aName = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii( + aName = cppu::UnoUrlDescriptor(OUString::createFromAscii( aTests[i].pInput)).getName(); bValid = true; } @@ -219,9 +219,9 @@ namespace cppu_unourl bool bPresent = false; try { - bPresent = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii( + bPresent = cppu::UnoUrlDescriptor(OUString::createFromAscii( aTests[i].pInput)). - hasParameter(rtl::OUString::createFromAscii(aTests[i].pKey)); + hasParameter(OUString::createFromAscii(aTests[i].pKey)); bValid = true; } catch (rtl::MalformedUriException &) @@ -286,12 +286,12 @@ namespace cppu_unourl for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i) { bool bValid = false; - rtl::OUString aValue; + OUString aValue; try { - aValue = cppu::UnoUrlDescriptor(rtl::OUString::createFromAscii( + aValue = cppu::UnoUrlDescriptor(OUString::createFromAscii( aTests[i].pInput)). - getParameter(rtl::OUString::createFromAscii(aTests[i].pKey)); + getParameter(OUString::createFromAscii(aTests[i].pKey)); bValid = true; } catch (rtl::MalformedUriException &) @@ -331,7 +331,7 @@ namespace cppu_unourl bool bValid = false; try { - cppu::UnoUrl aUrl(rtl::OUString::createFromAscii(aTests[i].pInput)); + cppu::UnoUrl aUrl(OUString::createFromAscii(aTests[i].pInput)); (void)aUrl; bValid = true; } @@ -367,10 +367,10 @@ namespace cppu_unourl for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i) { bool bValid = false; - rtl::OUString aConnection; + OUString aConnection; try { - aConnection = cppu::UnoUrl(rtl::OUString::createFromAscii( + aConnection = cppu::UnoUrl(OUString::createFromAscii( aTests[i].pInput)). getConnection().getDescriptor(); bValid = true; @@ -401,10 +401,10 @@ namespace cppu_unourl for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i) { bool bValid = false; - rtl::OUString aProtocol; + OUString aProtocol; try { - aProtocol = cppu::UnoUrl(rtl::OUString::createFromAscii( + aProtocol = cppu::UnoUrl(OUString::createFromAscii( aTests[i].pInput)). getProtocol().getDescriptor(); bValid = true; @@ -438,10 +438,10 @@ namespace cppu_unourl for (unsigned int i = 0; i < SAL_N_ELEMENTS(aTests); ++i) { bool bValid = false; - rtl::OUString aObjectName; + OUString aObjectName; try { - aObjectName = cppu::UnoUrl(rtl::OUString::createFromAscii( + aObjectName = cppu::UnoUrl(OUString::createFromAscii( aTests[i].pInput)).getObjectName(); bValid = true; } diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx index 164db03314eb..6af654408ed0 100644 --- a/cppuhelper/source/access_control.cxx +++ b/cppuhelper/source/access_control.cxx @@ -30,8 +30,6 @@ using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using rtl::OUString; - namespace { OUString str_ac_singleton() diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index c16d90681ab4..1eb11bfb486e 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using rtl::Bootstrap; -using rtl::OUString; namespace cppu { @@ -57,7 +56,7 @@ BootstrapException::BootstrapException() { } -BootstrapException::BootstrapException( const ::rtl::OUString & rMessage ) +BootstrapException::BootstrapException( const OUString & rMessage ) :m_aMessage( rMessage ) { } @@ -77,7 +76,7 @@ BootstrapException & BootstrapException::operator=( const BootstrapException & e return *this; } -const ::rtl::OUString & BootstrapException::getMessage() const +const OUString & BootstrapException::getMessage() const { return m_aMessage; } @@ -93,7 +92,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() throw BootstrapException( "no soffice installation found!"); } - rtl::OUString p2; + OUString p2; #if defined(_WIN32) p2 = o3tl::toU(p1); free(p1); @@ -148,7 +147,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() != rtl_Random_E_None ) throw BootstrapException( "random pool error!" ); rtl_random_destroyPool( hPool ); - ::rtl::OUStringBuffer buf("uno"); + OUStringBuffer buf("uno"); for (unsigned char byte : bytes) buf.append( static_cast< sal_Int32 >( byte ) ); OUString sPipeName( buf.makeStringAndClear() ); diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx index 50e19bfa5b8e..a019626f4a6a 100644 --- a/cppuhelper/source/compat.cxx +++ b/cppuhelper/source/compat.cxx @@ -51,7 +51,7 @@ namespace cppu { SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF( - rtl::OUString const &) + OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } @@ -59,55 +59,55 @@ css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF( SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::uno::XComponentContext > SAL_CALL bootstrap_InitialComponentContext( css::uno::Reference< css::registry::XSimpleRegistry > const &, - rtl::OUString const &) + OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry > -SAL_CALL createNestedRegistry(rtl::OUString const &) { +SAL_CALL createNestedRegistry(OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL createRegistryServiceFactory( - rtl::OUString const &, rtl::OUString const &, sal_Bool, - rtl::OUString const &) + OUString const &, OUString const &, sal_Bool, + OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry > -SAL_CALL createSimpleRegistry(rtl::OUString const &) { +SAL_CALL createSimpleRegistry(OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } SAL_DLLPUBLIC_EXPORT css::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence( css::uno::Reference< css::lang::XMultiServiceFactory > const &, - rtl::OUString const &, + OUString const &, css::uno::Reference< css::reflection::XIdlClass > const &, - css::uno::Sequence< rtl::OUString > const &) + css::uno::Sequence< OUString > const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } SAL_DLLPUBLIC_EXPORT css::uno::Reference<css::uno::XInterface> SAL_CALL invokeStaticComponentFactory( - oslGenericFunction, rtl::OUString const &, + oslGenericFunction, OUString const &, css::uno::Reference<css::lang::XMultiServiceFactory> const &, css::uno::Reference<css::registry::XRegistryKey> const &, - rtl::OUString const &) + OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } SAL_DLLPUBLIC_EXPORT css::uno::Reference<css::uno::XInterface> SAL_CALL loadSharedLibComponentFactory( - rtl::OUString const &, rtl::OUString const &, rtl::OUString const &, + OUString const &, OUString const &, OUString const &, css::uno::Reference<css::lang::XMultiServiceFactory> const &, css::uno::Reference<css::registry::XRegistryKey> const &, - rtl::OUString const &) + OUString const &) { for (;;) { std::abort(); } // avoid "must return a value" warnings } diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index c9bd6a4a9b28..02019d53f254 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -32,9 +32,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OString; -using ::rtl::OUStringToOString; - namespace cppu { diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 62839c64d491..b64d8b624849 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -53,9 +53,6 @@ using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -using rtl::OUString; -using rtl::OUStringBuffer; - namespace cppu { diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index 9f67fc8d3dd1..945268bf6444 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -23,8 +23,6 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -using rtl::OUString; - #include "macro_expander.hxx" #include "paths.hxx" #include "servicemanager.hxx" @@ -32,10 +30,10 @@ using rtl::OUString; namespace { -rtl::OUString getBootstrapVariable( - rtl::Bootstrap const & bootstrap, rtl::OUString const & name) +OUString getBootstrapVariable( + rtl::Bootstrap const & bootstrap, OUString const & name) { - rtl::OUString v; + OUString v; if (!bootstrap.getFrom(name, v)) { throw css::uno::DeploymentException( "Cannot obtain " + name + " from uno ini"); @@ -46,7 +44,7 @@ rtl::OUString getBootstrapVariable( } css::uno::Reference< css::uno::XComponentContext > -cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri) +cppu::defaultBootstrap_InitialComponentContext(OUString const & iniUri) { rtl::Bootstrap bs(iniUri); if (bs.getHandle() == nullptr) { @@ -83,12 +81,12 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri) context_values.push_back( cppu::ContextEntry_Init( "/services/com.sun.star.security.AccessController/mode", - css::uno::Any(rtl::OUString("off")), false)); + css::uno::Any(OUString("off")), false)); context_values.push_back( cppu::ContextEntry_Init( "/singletons/com.sun.star.security.theAccessController", css::uno::Any( - rtl::OUString("com.sun.star.security.AccessController")), + OUString("com.sun.star.security.AccessController")), true)); assert(!context_values.empty()); css::uno::Reference< css::uno::XComponentContext > context( diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index ee08c612e4e1..97eb8f851077 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -54,8 +54,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::loader; using namespace com::sun::star::registry; -using ::rtl::OUString; - namespace cppu { diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map index f1537e874020..d5af50655c1a 100644 --- a/cppuhelper/source/gcc3.map +++ b/cppuhelper/source/gcc3.map @@ -384,7 +384,7 @@ UDK_3.3 { # OOo 2.3 UDK_3.4 { # OOo 2.4 global: - _ZN4cppu19bootstrap_expandUriERKN3rtl8OUStringE; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &) + _ZN4cppu19bootstrap_expandUriERKN3rtl8OUStringE; # OUString cppu::bootstrap_expandUri(OUString const &) } UDK_3.3; UDK_3.5 { # OOo 3.0 @@ -427,7 +427,7 @@ global: LIBO_UDK_3.9 { # LibO 3.7 global: - _ZN4cppu15supportsServiceEPN3com3sun4star4lang12XServiceInfoERKN3rtl8OUStringE; # cppu::supportsService(com::sun::star::lang::XServiceInfo*, rtl::OUString const&) + _ZN4cppu15supportsServiceEPN3com3sun4star4lang12XServiceInfoERKN3rtl8OUStringE; # cppu::supportsService(com::sun::star::lang::XServiceInfo*, OUString const&) } UDK_3.8; LIBO_UDK_5.3 { # LibO 5.3 diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index c0f5477d2029..4372630a81a4 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -35,8 +35,6 @@ using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using rtl::OUString; - namespace { class theImplHelperInitMutex : public rtl::Static<Mutex, theImplHelperInitMutex>{}; diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index bd4ce00ffcc7..466d766558af 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -27,8 +27,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -using rtl::OUString; - namespace cppu { sal_Bool component_writeInfoHelper( diff --git a/cppuhelper/source/loadsharedlibcomponentfactory.hxx b/cppuhelper/source/loadsharedlibcomponentfactory.hxx index df6e2269e381..f496d61e687f 100644 --- a/cppuhelper/source/loadsharedlibcomponentfactory.hxx +++ b/cppuhelper/source/loadsharedlibcomponentfactory.hxx @@ -28,12 +28,12 @@ namespace rtl { class OUString; } namespace cppuhelper { namespace detail { css::uno::Environment getEnvironment( - rtl::OUString const & name, rtl::OUString const & implementation); + OUString const & name, OUString const & implementation); void loadSharedLibComponentFactory( - rtl::OUString const & uri, rtl::OUString const & environment, - rtl::OUString const & prefix, rtl::OUString const & implementation, - rtl::OUString const & constructor, + OUString const & uri, OUString const & environment, + OUString const & prefix, OUString const & implementation, + OUString const & constructor, css::uno::Reference<css::lang::XMultiServiceFactory> const & serviceManager, WrapperConstructorFn * constructorFunction, css::uno::Reference<css::uno::XInterface> * factory); diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 2b8d5407ce81..7d9b763aac05 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using rtl::Bootstrap; -using rtl::OUString; namespace cppu { @@ -76,8 +75,8 @@ static Bootstrap const & get_unorc() namespace cppuhelper { namespace detail { -rtl::OUString expandMacros(rtl::OUString const & text) { - rtl::OUString t(text); +OUString expandMacros(OUString const & text) { + OUString t(text); rtl_bootstrap_expandMacros_from_handle( cppu::get_unorc().getHandle(), &t.pData); return t; diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx index 275fa1c4a57b..dc753de9663a 100644 --- a/cppuhelper/source/macro_expander.hxx +++ b/cppuhelper/source/macro_expander.hxx @@ -49,7 +49,7 @@ namespace detail { * If uriReference is a vnd.sun.star.expand URL reference that contains unknown * macros. */ -::rtl::OUString expandMacros(rtl::OUString const & text); +OUString expandMacros(OUString const & text); css::uno::Reference< css::lang::XSingleComponentFactory > create_bootstrap_macro_expander_factory(); diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx index 38584b38ee4d..6b7dcd443038 100644 --- a/cppuhelper/source/paths.cxx +++ b/cppuhelper/source/paths.cxx @@ -37,10 +37,10 @@ namespace { #ifndef ANDROID -rtl::OUString get_this_libpath() { - static rtl::OUString s_uri; +OUString get_this_libpath() { + static OUString s_uri; if (s_uri.isEmpty()) { - rtl::OUString uri; + OUString uri; osl::Module::getUrlFromAddress( reinterpret_cast< oslGenericFunction >(get_this_libpath), uri); sal_Int32 i = uri.lastIndexOf('/'); @@ -59,7 +59,7 @@ rtl::OUString get_this_libpath() { #endif } -rtl::OUString cppu::getUnoIniUri() { +OUString cppu::getUnoIniUri() { #if defined ANDROID // Wouldn't it be lovely to avoid this ugly hard-coding. // The problem is that the 'create_bootstrap_macro_expander_factory()' @@ -68,9 +68,9 @@ rtl::OUString cppu::getUnoIniUri() { // defaultBootstrap_InitialComponentContext // and since rtlBootstrapHandle is not ref-counted doing anything // clean here is hardish. - rtl::OUString uri("file:///assets/program"); + OUString uri("file:///assets/program"); #else - rtl::OUString uri(get_this_libpath()); + OUString uri(get_this_libpath()); #ifdef MACOSX // We keep both the LO and URE dylibs directly in "Frameworks" // (that is, LIBO_LIB_FOLDER) and rc files in "Resources" @@ -88,7 +88,7 @@ rtl::OUString cppu::getUnoIniUri() { return uri + "/" SAL_CONFIGFILE("uno"); } -bool cppu::nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) { +bool cppu::nextDirectoryItem(osl::Directory & directory, OUString * url) { assert(url != nullptr); for (;;) { osl::DirectoryItem i; @@ -110,7 +110,7 @@ bool cppu::nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) { } if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks // Ignore backup files: - rtl::OUString name(stat.getFileName()); + OUString name(stat.getFileName()); if (!(name.match(".") || name.endsWith("~"))) { *url = stat.getFileURL(); return true; @@ -119,7 +119,7 @@ bool cppu::nextDirectoryItem(osl::Directory & directory, rtl::OUString * url) { } } -void cppu::decodeRdbUri(rtl::OUString * uri, bool * optional, bool * directory) +void cppu::decodeRdbUri(OUString * uri, bool * optional, bool * directory) { assert(uri != nullptr && optional != nullptr && directory != nullptr); if(!(uri->isEmpty())) diff --git a/cppuhelper/source/paths.hxx b/cppuhelper/source/paths.hxx index b7fde71d0726..f757d906b171 100644 --- a/cppuhelper/source/paths.hxx +++ b/cppuhelper/source/paths.hxx @@ -27,11 +27,11 @@ namespace rtl { class OUString; } namespace cppu { -rtl::OUString getUnoIniUri(); +OUString getUnoIniUri(); -bool nextDirectoryItem(osl::Directory & directory, rtl::OUString * url); +bool nextDirectoryItem(osl::Directory & directory, OUString * url); -void decodeRdbUri(rtl::OUString * uri, bool * optional, bool * directory); +void decodeRdbUri(OUString * uri, bool * optional, bool * directory); } diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index 0c4898fb00df..d04119cafe5b 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -90,29 +90,29 @@ struct PropertyData { }; struct Data: public salhelper::SimpleReferenceObject { - typedef std::map< rtl::OUString, PropertyData > PropertyMap; + typedef std::map< OUString, PropertyData > PropertyMap; PropertyMap properties; PropertyMap::const_iterator get( css::uno::Reference< css::uno::XInterface > const & object, - rtl::OUString const & name) const; + OUString const & name) const; protected: void initProperties( css::uno::Reference< css::reflection::XTypeDescription > const & type, - css::uno::Sequence< rtl::OUString > const & absentOptional, - std::vector< rtl::OUString > * handleNames) + css::uno::Sequence< OUString > const & absentOptional, + std::vector< OUString > * handleNames) { - std::set<rtl::OUString> seen; + std::set<OUString> seen; initProperties(type, absentOptional, handleNames, &seen); } private: void initProperties( css::uno::Reference< css::reflection::XTypeDescription > const & type, - css::uno::Sequence< rtl::OUString > const & absentOptional, - std::vector< rtl::OUString > * handleNames, std::set<rtl::OUString> * seen); + css::uno::Sequence< OUString > const & absentOptional, + std::vector< OUString > * handleNames, std::set<OUString> * seen); static css::uno::Reference< css::reflection::XTypeDescription > resolveTypedefs( @@ -121,7 +121,7 @@ private: Data::PropertyMap::const_iterator Data::get( css::uno::Reference< css::uno::XInterface > const & object, - rtl::OUString const & name) const + OUString const & name) const { PropertyMap::const_iterator i(properties.find(name)); if (i == properties.end() || !i->second.present) { @@ -132,8 +132,8 @@ Data::PropertyMap::const_iterator Data::get( void Data::initProperties( css::uno::Reference< css::reflection::XTypeDescription > const & type, - css::uno::Sequence< rtl::OUString > const & absentOptional, - std::vector< rtl::OUString > * handleNames, std::set<rtl::OUString> * seen) + css::uno::Sequence< OUString > const & absentOptional, + std::vector< OUString > * handleNames, std::set<OUString> * seen) { css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc( resolveTypedefs(type), css::uno::UNO_QUERY_THROW); @@ -148,8 +148,8 @@ void Data::initProperties( css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > > members( ifc->getMembers()); - rtl::OUString const * absentBegin = absentOptional.getConstArray(); - rtl::OUString const * absentEnd = + OUString const * absentBegin = absentOptional.getConstArray(); + OUString const * absentEnd = absentBegin + absentOptional.getLength(); for (sal_Int32 i = 0; i < members.getLength(); ++i) { if (members[i]->getTypeClass() @@ -234,13 +234,13 @@ void Data::initProperties( } t = args[0]; } - std::vector< rtl::OUString >::size_type handles + std::vector< OUString >::size_type handles = handleNames->size(); if (handles > SAL_MAX_INT32) { throw css::uno::RuntimeException( "interface type has too many attributes"); } - rtl::OUString name(members[i]->getMemberName()); + OUString name(members[i]->getMemberName()); if (!properties.emplace( name, PropertyData( @@ -280,9 +280,9 @@ public: virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override; virtual css::beans::Property SAL_CALL getPropertyByName( - rtl::OUString const & name) override; + OUString const & name) override; - virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name) override; + virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & name) override; private: rtl::Reference< Data > m_data; @@ -305,13 +305,13 @@ css::uno::Sequence< css::beans::Property > Info::getProperties() return s; } -css::beans::Property Info::getPropertyByName(rtl::OUString const & name) +css::beans::Property Info::getPropertyByName(OUString const & name) { return m_data->get(static_cast< cppu::OWeakObject * >(this), name)-> second.property; } -sal_Bool Info::hasPropertyByName(rtl::OUString const & name) +sal_Bool Info::hasPropertyByName(OUString const & name) { Data::PropertyMap::iterator i(m_data->properties.find(name)); return i != m_data->properties.end() && i->second.present; @@ -359,33 +359,33 @@ public: Impl( css::uno::Reference< css::uno::XComponentContext > const & context, Implements theImplements, - css::uno::Sequence< rtl::OUString > const & absentOptional, + css::uno::Sequence< OUString > const & absentOptional, css::uno::Type const & type); - rtl::OUString const & translateHandle( + OUString const & translateHandle( css::uno::Reference< css::uno::XInterface > const & object, sal_Int32 handle) const; void setProperty( css::uno::Reference< css::uno::XInterface > const & object, - rtl::OUString const & name, css::uno::Any const & value, + OUString const & name, css::uno::Any const & value, bool isAmbiguous, bool isDefaulted, sal_Int16 illegalArgumentPosition) const; css::uno::Any getProperty( css::uno::Reference< css::uno::XInterface > const & object, - rtl::OUString const & name, css::beans::PropertyState * state) const; + OUString const & name, css::beans::PropertyState * state) const; PropertySetMixinImpl::Implements implements; - css::uno::Sequence< rtl::OUString > handleMap; + css::uno::Sequence< OUString > handleMap; - typedef std::map< rtl::OUString, BoundListenerBag > BoundListenerMap; + typedef std::map< OUString, BoundListenerBag > BoundListenerMap; typedef std::multiset< css::uno::Reference< css::beans::XVetoableChangeListener > > VetoListenerBag; - typedef std::map< rtl::OUString, VetoListenerBag > VetoListenerMap; + typedef std::map< OUString, VetoListenerBag > VetoListenerMap; mutable osl::Mutex mutex; BoundListenerMap boundListeners; @@ -394,7 +394,7 @@ public: private: css::uno::Reference< css::reflection::XIdlClass > getReflection( - rtl::OUString const & typeName) const; + OUString const & typeName) const; static css::uno::Any wrapValue( css::uno::Reference< css::uno::XInterface > const & object, @@ -411,7 +411,7 @@ private: PropertySetMixinImpl::Impl::Impl( css::uno::Reference< css::uno::XComponentContext > const & context, Implements theImplements, - css::uno::Sequence< rtl::OUString > const & absentOptional, + css::uno::Sequence< OUString > const & absentOptional, css::uno::Type const & type): implements(theImplements), disposed(false), m_context(context), m_type(type) @@ -440,28 +440,28 @@ PropertySetMixinImpl::Impl::Impl( + e.Message, nullptr, anyEx ); } - std::vector< rtl::OUString > handleNames; + std::vector< OUString > handleNames; initProperties(ifc, absentOptional, &handleNames); - std::vector< rtl::OUString >::size_type size = handleNames.size(); + std::vector< OUString >::size_type size = handleNames.size(); assert(size <= SAL_MAX_INT32); handleMap.realloc(static_cast< sal_Int32 >(size)); std::copy(handleNames.begin(), handleNames.end(), handleMap.getArray()); } -rtl::OUString const & PropertySetMixinImpl::Impl::translateHandle( +OUString const & PropertySetMixinImpl::Impl::translateHandle( css::uno::Reference< css::uno::XInterface > const & object, sal_Int32 handle) const { if (handle < 0 || handle >= handleMap.getLength()) { throw css::beans::UnknownPropertyException( - "bad handle " + rtl::OUString::number(handle), object); + "bad handle " + OUString::number(handle), object); } return handleMap[handle]; } void PropertySetMixinImpl::Impl::setProperty( css::uno::Reference< css::uno::XInterface > const & object, - rtl::OUString const & name, css::uno::Any const & value, bool isAmbiguous, + OUString const & name, css::uno::Any const & value, bool isAmbiguous, bool isDefaulted, sal_Int16 illegalArgumentPosition) const { PropertyMap::const_iterator i(properties.find(name)); @@ -553,7 +553,7 @@ void PropertySetMixinImpl::Impl::setProperty( css::uno::Any PropertySetMixinImpl::Impl::getProperty( css::uno::Reference< css::uno::XInterface > const & object, - rtl::OUString const & name, css::beans::PropertyState * state) const + OUString const & name, css::beans::PropertyState * state) const { PropertyMap::const_iterator i(properties.find(name)); if (i == properties.end()) { @@ -710,7 +710,7 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty( } css::uno::Reference< css::reflection::XIdlClass > -PropertySetMixinImpl::Impl::getReflection(rtl::OUString const & typeName) const +PropertySetMixinImpl::Impl::getReflection(OUString const & typeName) const { return css::uno::Reference< css::reflection::XIdlClass >( css::reflection::theCoreReflection::get(m_context)->forName(typeName), @@ -832,7 +832,7 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue( PropertySetMixinImpl::PropertySetMixinImpl( css::uno::Reference< css::uno::XComponentContext > const & context, Implements implements, - css::uno::Sequence< rtl::OUString > const & absentOptional, + css::uno::Sequence< OUString > const & absentOptional, css::uno::Type const & type) { m_impl = new Impl(context, implements, absentOptional, type); @@ -843,7 +843,7 @@ PropertySetMixinImpl::~PropertySetMixinImpl() { m_impl->release(); } -void PropertySetMixinImpl::checkUnknown(rtl::OUString const & propertyName) { +void PropertySetMixinImpl::checkUnknown(OUString const & propertyName) { if (!propertyName.isEmpty()) { m_impl->get( static_cast< css::beans::XPropertySet * >(this), propertyName); @@ -851,7 +851,7 @@ void PropertySetMixinImpl::checkUnknown(rtl::OUString const & propertyName) { } void PropertySetMixinImpl::prepareSet( - rtl::OUString const & propertyName, css::uno::Any const & oldValue, + OUString const & propertyName, css::uno::Any const & oldValue, css::uno::Any const & newValue, BoundListeners * boundListeners) { Impl::PropertyMap::const_iterator it(m_impl->properties.find(propertyName)); @@ -990,7 +990,7 @@ PropertySetMixinImpl::getPropertySetInfo() } void PropertySetMixinImpl::setPropertyValue( - rtl::OUString const & propertyName, css::uno::Any const & value) + OUString const & propertyName, css::uno::Any const & value) { m_impl->setProperty( static_cast< css::beans::XPropertySet * >(this), propertyName, value, @@ -998,14 +998,14 @@ void PropertySetMixinImpl::setPropertyValue( } css::uno::Any PropertySetMixinImpl::getPropertyValue( - rtl::OUString const & propertyName) + OUString const & propertyName) { return m_impl->getProperty( static_cast< css::beans::XPropertySet * >(this), propertyName, nullptr); } void PropertySetMixinImpl::addPropertyChangeListener( - rtl::OUString const & propertyName, + OUString const & propertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & listener) { css::uno::Reference< css::beans::XPropertyChangeListener >( @@ -1027,7 +1027,7 @@ void PropertySetMixinImpl::addPropertyChangeListener( } void PropertySetMixinImpl::removePropertyChangeListener( - rtl::OUString const & propertyName, + OUString const & propertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & listener) { assert(listener.is()); @@ -1044,7 +1044,7 @@ void PropertySetMixinImpl::removePropertyChangeListener( } void PropertySetMixinImpl::addVetoableChangeListener( - rtl::OUString const & propertyName, + OUString const & propertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & listener) { css::uno::Reference< css::beans::XVetoableChangeListener >( @@ -1066,7 +1066,7 @@ void PropertySetMixinImpl::addVetoableChangeListener( } void PropertySetMixinImpl::removeVetoableChangeListener( - rtl::OUString const & propertyName, + OUString const & propertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & listener) { assert(listener.is()); @@ -1138,7 +1138,7 @@ void PropertySetMixinImpl::setPropertyValues( { throw css::beans::UnknownPropertyException( ("name " + props[i].Name + " does not match handle " - + rtl::OUString::number(props[i].Handle)), + + OUString::number(props[i].Handle)), static_cast< css::beans::XPropertySet * >(this)); } m_impl->setProperty( diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 83e7726f0a35..46494e00c827 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -35,8 +35,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace cppu; -using ::rtl::OUString; - namespace cppu { IPropertyArrayHelper::~IPropertyArrayHelper() diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 3fac957ebc3a..a9c06fa1bce9 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -74,14 +74,14 @@ void insertImplementationMap( void removeFromImplementationMap( cppuhelper::ServiceManager::Data::ImplementationMap * map, - std::vector< rtl::OUString > const & elements, + std::vector< OUString > const & elements, std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > const & implementation) { // The underlying data structures make this function somewhat inefficient, // but the assumption is that it is rarely called: assert(map != nullptr); - for (std::vector< rtl::OUString >::const_iterator i(elements.begin()); + for (std::vector< OUString >::const_iterator i(elements.begin()); i != elements.end(); ++i) { cppuhelper::ServiceManager::Data::ImplementationMap::iterator j( @@ -105,7 +105,7 @@ void removeFromImplementationMap( class Parser { public: Parser( - rtl::OUString const & uri, + OUString const & uri, css::uno::Reference< css::uno::XComponentContext > const & alienContext, cppuhelper::ServiceManager::Data * data); @@ -121,21 +121,21 @@ private: void handleSingleton(); - rtl::OUString getNameAttribute(); + OUString getNameAttribute(); xmlreader::XmlReader reader_; css::uno::Reference< css::uno::XComponentContext > alienContext_; cppuhelper::ServiceManager::Data * data_; - rtl::OUString attrLoader_; - rtl::OUString attrUri_; - rtl::OUString attrEnvironment_; - rtl::OUString attrPrefix_; + OUString attrLoader_; + OUString attrUri_; + OUString attrEnvironment_; + OUString attrPrefix_; std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > implementation_; }; Parser::Parser( - rtl::OUString const & uri, + OUString const & uri, css::uno::Reference< css::uno::XComponentContext > const & alienContext, cppuhelper::ServiceManager::Data * data): reader_(uri), alienContext_(alienContext), data_(data) @@ -239,10 +239,10 @@ Parser::Parser( } void Parser::handleComponent() { - attrLoader_ = rtl::OUString(); - attrUri_ = rtl::OUString(); - attrEnvironment_ = rtl::OUString(); - attrPrefix_ = rtl::OUString(); + attrLoader_ = OUString(); + attrUri_ = OUString(); + attrEnvironment_ = OUString(); + attrPrefix_ = OUString(); xmlreader::Span name; int nsId; while (reader_.nextAttribute(&nsId, &name)) { @@ -328,8 +328,8 @@ void Parser::handleComponent() { } void Parser::handleImplementation() { - rtl::OUString attrName; - rtl::OUString attrConstructor; + OUString attrName; + OUString attrConstructor; xmlreader::Span name; int nsId; while (reader_.nextAttribute(&nsId, &name)) { @@ -394,19 +394,19 @@ void Parser::handleImplementation() { } void Parser::handleService() { - rtl::OUString name(getNameAttribute()); + OUString name(getNameAttribute()); implementation_->info->services.push_back(name); data_->services[name].push_back(implementation_); } void Parser::handleSingleton() { - rtl::OUString name(getNameAttribute()); + OUString name(getNameAttribute()); implementation_->info->singletons.push_back(name); data_->singletons[name].push_back(implementation_); } -rtl::OUString Parser::getNameAttribute() { - rtl::OUString attrName; +OUString Parser::getNameAttribute() { + OUString attrName; xmlreader::Span name; int nsId; while (reader_.nextAttribute(&nsId, &name)) { @@ -566,11 +566,11 @@ private: createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & Arguments) override; - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; rtl::Reference< cppuhelper::ServiceManager > manager_; @@ -614,19 +614,19 @@ ImplementationWrapper::createInstanceWithArguments( Arguments, manager_->getContext()); } -rtl::OUString ImplementationWrapper::getImplementationName() +OUString ImplementationWrapper::getImplementationName() { std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); assert(impl); return impl->info->name; } -sal_Bool ImplementationWrapper::supportsService(rtl::OUString const & ServiceName) +sal_Bool ImplementationWrapper::supportsService(OUString const & ServiceName) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > ImplementationWrapper::getSupportedServiceNames() { std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock(); @@ -639,10 +639,10 @@ ImplementationWrapper::getSupportedServiceNames() + " supports too many services"), static_cast< cppu::OWeakObject * >(this)); } - css::uno::Sequence< rtl::OUString > names( + css::uno::Sequence< OUString > names( static_cast< sal_Int32 >(impl->info->services.size())); sal_Int32 i = 0; - for (std::vector< rtl::OUString >::const_iterator j( + for (std::vector< OUString >::const_iterator j( impl->info->services.begin()); j != impl->info->services.end(); ++j) { @@ -762,7 +762,7 @@ void cppuhelper::ServiceManager::loadImplementation( return; } } - rtl::OUString uri; + OUString uri; try { uri = cppu::bootstrap_expandUri(implementation->info->uri); } catch (css::lang::IllegalArgumentException & e) { @@ -813,7 +813,7 @@ void cppuhelper::ServiceManager::loadImplementation( smgr->createInstanceWithContext(implementation->info->loader, ctxt), css::uno::UNO_QUERY_THROW); f0 = loader->activate( - implementation->info->name, rtl::OUString(), uri, + implementation->info->name, OUString(), uri, css::uno::Reference< css::registry::XRegistryKey >()); } css::uno::Reference<css::lang::XSingleComponentFactory> f1; @@ -916,22 +916,22 @@ void cppuhelper::ServiceManager::initialize( preloadImplementations(); } -rtl::OUString cppuhelper::ServiceManager::getImplementationName() +OUString cppuhelper::ServiceManager::getImplementationName() { - return rtl::OUString( + return OUString( "com.sun.star.comp.cppuhelper.bootstrap.ServiceManager"); } sal_Bool cppuhelper::ServiceManager::supportsService( - rtl::OUString const & ServiceName) + OUString const & ServiceName) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > cppuhelper::ServiceManager::getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > names(2); + css::uno::Sequence< OUString > names(2); names[0] = "com.sun.star.lang.MultiServiceFactory"; names[1] = "com.sun.star.lang.ServiceManager"; return names; @@ -939,7 +939,7 @@ cppuhelper::ServiceManager::getSupportedServiceNames() css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstance( - rtl::OUString const & aServiceSpecifier) + OUString const & aServiceSpecifier) { assert(context_.is()); return createInstanceWithContext(aServiceSpecifier, context_); @@ -947,7 +947,7 @@ cppuhelper::ServiceManager::createInstance( css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstanceWithArguments( - rtl::OUString const & ServiceSpecifier, + OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) { assert(context_.is()); @@ -955,12 +955,12 @@ cppuhelper::ServiceManager::createInstanceWithArguments( ServiceSpecifier, Arguments, context_); } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > cppuhelper::ServiceManager::getAvailableServiceNames() { osl::MutexGuard g(rBHelper.rMutex); if (isDisposed()) { - return css::uno::Sequence< rtl::OUString >(); + return css::uno::Sequence< OUString >(); } Data::ImplementationMap::size_type n = data_.services.size(); if (n > static_cast< sal_uInt32 >(SAL_MAX_INT32)) { @@ -968,7 +968,7 @@ cppuhelper::ServiceManager::getAvailableServiceNames() "getAvailableServiceNames: too many services", static_cast< cppu::OWeakObject * >(this)); } - css::uno::Sequence< rtl::OUString > names(static_cast< sal_Int32 >(n)); + css::uno::Sequence< OUString > names(static_cast< sal_Int32 >(n)); sal_Int32 i = 0; for (Data::ImplementationMap::const_iterator j(data_.services.begin()); j != data_.services.end(); ++j) @@ -981,7 +981,7 @@ cppuhelper::ServiceManager::getAvailableServiceNames() css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstanceWithContext( - rtl::OUString const & aServiceSpecifier, + OUString const & aServiceSpecifier, css::uno::Reference< css::uno::XComponentContext > const & Context) { std::shared_ptr< Data::Implementation > impl( @@ -992,7 +992,7 @@ cppuhelper::ServiceManager::createInstanceWithContext( css::uno::Reference< css::uno::XInterface > cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext( - rtl::OUString const & ServiceSpecifier, + OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) { @@ -1034,11 +1034,11 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement) { css::uno::Sequence< css::beans::NamedValue > args; if (aElement >>= args) { - std::vector< rtl::OUString > uris; + std::vector< OUString > uris; css::uno::Reference< css::uno::XComponentContext > alienContext; for (sal_Int32 i = 0; i < args.getLength(); ++i) { if (args[i].Name == "uri") { - rtl::OUString uri; + OUString uri; if (!(args[i].Value >>= uri)) { throw css::lang::IllegalArgumentException( "Bad uri argument", @@ -1097,13 +1097,13 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement) { css::uno::Sequence< css::beans::NamedValue > args; if (aElement >>= args) { - std::vector< rtl::OUString > uris; + std::vector< OUString > uris; for (sal_Int32 i = 0; i < args.getLength(); ++i) { if (args[i].Name != "uri") { throw css::lang::IllegalArgumentException( "Bad argument " + args[i].Name, static_cast< cppu::OWeakObject * >(this), 0); - } rtl::OUString uri; + } OUString uri; if (!(args[i].Value >>= uri)) { throw css::lang::IllegalArgumentException( "Bad uri argument", @@ -1123,7 +1123,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement) } return; } - rtl::OUString impl; + OUString impl; if (aElement >>= impl) { // For live-removal of extensions: removeImplementation(impl); @@ -1135,7 +1135,7 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement) css::uno::Reference< css::container::XEnumeration > cppuhelper::ServiceManager::createContentEnumeration( - rtl::OUString const & aServiceName) + OUString const & aServiceName) { std::vector< std::shared_ptr< Data::Implementation > > impls; { @@ -1191,7 +1191,7 @@ cppuhelper::ServiceManager::getPropertySetInfo() } void cppuhelper::ServiceManager::setPropertyValue( - rtl::OUString const & aPropertyName, css::uno::Any const &) + OUString const & aPropertyName, css::uno::Any const &) { if (aPropertyName == "DefaultContext") { throw css::beans::PropertyVetoException( @@ -1203,7 +1203,7 @@ void cppuhelper::ServiceManager::setPropertyValue( } css::uno::Any cppuhelper::ServiceManager::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) { if (PropertyName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1214,7 +1214,7 @@ css::uno::Any cppuhelper::ServiceManager::getPropertyValue( } void cppuhelper::ServiceManager::addPropertyChangeListener( - rtl::OUString const & aPropertyName, + OUString const & aPropertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & xListener) { @@ -1227,7 +1227,7 @@ void cppuhelper::ServiceManager::addPropertyChangeListener( } void cppuhelper::ServiceManager::removePropertyChangeListener( - rtl::OUString const & aPropertyName, + OUString const & aPropertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & aListener) { @@ -1240,7 +1240,7 @@ void cppuhelper::ServiceManager::removePropertyChangeListener( } void cppuhelper::ServiceManager::addVetoableChangeListener( - rtl::OUString const & PropertyName, + OUString const & PropertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & aListener) { @@ -1253,7 +1253,7 @@ void cppuhelper::ServiceManager::addVetoableChangeListener( } void cppuhelper::ServiceManager::removeVetoableChangeListener( - rtl::OUString const & PropertyName, + OUString const & PropertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & aListener) { @@ -1273,7 +1273,7 @@ cppuhelper::ServiceManager::getProperties() { } css::beans::Property cppuhelper::ServiceManager::getPropertyByName( - rtl::OUString const & aName) + OUString const & aName) { if (aName != "DefaultContext") { throw css::beans::UnknownPropertyException( @@ -1283,7 +1283,7 @@ css::beans::Property cppuhelper::ServiceManager::getPropertyByName( } sal_Bool cppuhelper::ServiceManager::hasPropertyByName( - rtl::OUString const & Name) + OUString const & Name) { return Name == "DefaultContext"; } @@ -1312,9 +1312,9 @@ void cppuhelper::ServiceManager::removeEventListenerFromComponent( } } -void cppuhelper::ServiceManager::init(rtl::OUString const & rdbUris) { +void cppuhelper::ServiceManager::init(OUString const & rdbUris) { for (sal_Int32 i = 0; i != -1;) { - rtl::OUString uri(rdbUris.getToken(0, ' ', i)); + OUString uri(rdbUris.getToken(0, ' ', i)); if (uri.isEmpty()) { continue; } @@ -1330,7 +1330,7 @@ void cppuhelper::ServiceManager::init(rtl::OUString const & rdbUris) { } void cppuhelper::ServiceManager::readRdbDirectory( - rtl::OUString const & uri, bool optional) + OUString const & uri, bool optional) { osl::Directory dir(uri); switch (dir.open()) { @@ -1348,7 +1348,7 @@ void cppuhelper::ServiceManager::readRdbDirectory( static_cast< cppu::OWeakObject * >(this)); } for (;;) { - rtl::OUString url; + OUString url; if (!cppu::nextDirectoryItem(dir, &url)) { break; } @@ -1357,7 +1357,7 @@ void cppuhelper::ServiceManager::readRdbDirectory( } void cppuhelper::ServiceManager::readRdbFile( - rtl::OUString const & uri, bool optional) + OUString const & uri, bool optional) { try { Parser( @@ -1382,7 +1382,7 @@ void cppuhelper::ServiceManager::readRdbFile( } } -bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { +bool cppuhelper::ServiceManager::readLegacyRdbFile(OUString const & uri) { Registry reg; switch (reg.open(uri, RegAccessMode::READONLY)) { case RegError::NO_ERROR: @@ -1427,7 +1427,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { for (sal_uInt32 i = 0; i != impls.getLength(); ++i) { RegistryKey implKey(impls.getElement(i)); assert(implKey.getName().match("/IMPLEMENTATIONS/")); - rtl::OUString name( + OUString name( implKey.getName().copy(RTL_CONSTASCII_LENGTH("/IMPLEMENTATIONS/"))); std::shared_ptr< Data::Implementation > impl( new Data::Implementation( @@ -1441,7 +1441,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { } readLegacyRdbStrings( uri, implKey, "UNO/SERVICES", &impl->info->services); - for (std::vector< rtl::OUString >::const_iterator j( + for (std::vector< OUString >::const_iterator j( impl->info->services.begin()); j != impl->info->services.end(); ++j) { @@ -1449,7 +1449,7 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { } readLegacyRdbStrings( uri, implKey, "UNO/SINGLETONS", &impl->info->singletons); - for (std::vector< rtl::OUString >::const_iterator j( + for (std::vector< OUString >::const_iterator j( impl->info->singletons.begin()); j != impl->info->singletons.end(); ++j) { @@ -1459,14 +1459,14 @@ bool cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { return true; } -rtl::OUString cppuhelper::ServiceManager::readLegacyRdbString( - rtl::OUString const & uri, RegistryKey & key, rtl::OUString const & path) +OUString cppuhelper::ServiceManager::readLegacyRdbString( + OUString const & uri, RegistryKey & key, OUString const & path) { RegistryKey subkey; RegValueType t; sal_uInt32 s(0); if (key.openKey(path, subkey) != RegError::NO_ERROR - || subkey.getValueInfo(rtl::OUString(), &t, &s) != RegError::NO_ERROR + || subkey.getValueInfo(OUString(), &t, &s) != RegError::NO_ERROR || t != RegValueType::STRING || s == 0 || s > static_cast< sal_uInt32 >(SAL_MAX_INT32)) { @@ -1474,9 +1474,9 @@ rtl::OUString cppuhelper::ServiceManager::readLegacyRdbString( "Failure reading legacy rdb file " + uri, static_cast< cppu::OWeakObject * >(this)); } - rtl::OUString val; + OUString val; std::vector< char > v(s); // assuming sal_uInt32 fits into vector::size_type - if (subkey.getValue(rtl::OUString(), &v[0]) != RegError::NO_ERROR + if (subkey.getValue(OUString(), &v[0]) != RegError::NO_ERROR || v.back() != '\0' || !rtl_convertStringToUString( &val.pData, &v[0], static_cast< sal_Int32 >(s - 1), @@ -1493,8 +1493,8 @@ rtl::OUString cppuhelper::ServiceManager::readLegacyRdbString( } void cppuhelper::ServiceManager::readLegacyRdbStrings( - rtl::OUString const & uri, RegistryKey & key, rtl::OUString const & path, - std::vector< rtl::OUString > * strings) + OUString const & uri, RegistryKey & key, OUString const & path, + std::vector< OUString > * strings) { assert(strings != nullptr); RegistryKey subkey; @@ -1508,9 +1508,9 @@ void cppuhelper::ServiceManager::readLegacyRdbStrings( "Failure reading legacy rdb file " + uri, static_cast< cppu::OWeakObject * >(this)); } - rtl::OUString prefix(subkey.getName() + "/"); + OUString prefix(subkey.getName() + "/"); RegistryKeyNames names; - if (subkey.getKeyNames(rtl::OUString(), names) != RegError::NO_ERROR) { + if (subkey.getKeyNames(OUString(), names) != RegError::NO_ERROR) { throw css::uno::DeploymentException( "Failure reading legacy rdb file " + uri, static_cast< cppu::OWeakObject * >(this)); @@ -1522,11 +1522,11 @@ void cppuhelper::ServiceManager::readLegacyRdbStrings( } void cppuhelper::ServiceManager::insertRdbFiles( - std::vector< rtl::OUString > const & uris, + std::vector< OUString > const & uris, css::uno::Reference< css::uno::XComponentContext > const & alienContext) { Data extra; - for (std::vector< rtl::OUString >::const_iterator i(uris.begin()); + for (std::vector< OUString >::const_iterator i(uris.begin()); i != uris.end(); ++i) { try { @@ -1548,7 +1548,7 @@ void cppuhelper::ServiceManager::insertLegacyFactory( css::uno::Reference< css::lang::XServiceInfo > const & factoryInfo) { assert(factoryInfo.is()); - rtl::OUString name(factoryInfo->getImplementationName()); + OUString name(factoryInfo->getImplementationName()); css::uno::Reference< css::lang::XSingleComponentFactory > f1( factoryInfo, css::uno::UNO_QUERY); css::uno::Reference< css::lang::XSingleServiceFactory > f2; @@ -1570,7 +1570,7 @@ void cppuhelper::ServiceManager::insertLegacyFactory( extra.namedImplementations.emplace(name, impl); } extra.dynamicImplementations.emplace(factoryInfo, impl); - css::uno::Sequence< rtl::OUString > services( + css::uno::Sequence< OUString > services( factoryInfo->getSupportedServiceNames()); for (sal_Int32 i = 0; i != services.getLength(); ++i) { impl->info->services.push_back(services[i]); @@ -1631,7 +1631,7 @@ bool cppuhelper::ServiceManager::insertExtraData(Data const & extra) { extra.singletons.begin()); i != extra.singletons.end(); ++i) { - rtl::OUString name("/singletons/" + i->first); + OUString name("/singletons/" + i->first); //TODO: Update should be atomic: try { cont->removeByName(name + "/arguments"); @@ -1662,7 +1662,7 @@ bool cppuhelper::ServiceManager::insertExtraData(Data const & extra) { } void cppuhelper::ServiceManager::removeRdbFiles( - std::vector< rtl::OUString > const & uris) + std::vector< OUString > const & uris) { // The underlying data structures make this function somewhat inefficient, // but the assumption is that it is rarely called (and that if it is called, @@ -1670,7 +1670,7 @@ void cppuhelper::ServiceManager::removeRdbFiles( std::vector< std::shared_ptr< Data::Implementation > > clear; { osl::MutexGuard g(rBHelper.rMutex); - for (std::vector< rtl::OUString >::const_iterator i(uris.begin()); + for (std::vector< OUString >::const_iterator i(uris.begin()); i != uris.end(); ++i) { for (Data::NamedImplementations::iterator j( @@ -1732,7 +1732,7 @@ bool cppuhelper::ServiceManager::removeLegacyFactory( return true; } -void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name) { +void cppuhelper::ServiceManager::removeImplementation(const OUString & name) { // The underlying data structures make this function somewhat inefficient, // but the assumption is that it is rarely called: std::shared_ptr< Data::Implementation > clear; @@ -1771,7 +1771,7 @@ void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > cppuhelper::ServiceManager::findServiceImplementation( css::uno::Reference< css::uno::XComponentContext > const & context, - rtl::OUString const & specifier) + OUString const & specifier) { std::shared_ptr< Data::Implementation > impl; bool loaded; @@ -1806,7 +1806,7 @@ cppuhelper::ServiceManager::findServiceImplementation( /// Make a simpler unique name for preload / progress reporting. #ifndef DISABLE_DYNLOADING -static rtl::OUString simplifyModule(const rtl::OUString &uri) +static OUString simplifyModule(const OUString &uri) { sal_Int32 nIdx; OUStringBuffer edit(uri); @@ -1837,7 +1837,7 @@ void cppuhelper::ServiceManager::preloadImplementations() { #ifdef DISABLE_DYNLOADING abort(); #else - rtl::OUString aUri; + OUString aUri; osl::MutexGuard g(rBHelper.rMutex); css::uno::Environment aSourceEnv(css::uno::Environment::getCurrent()); @@ -1851,7 +1851,7 @@ void cppuhelper::ServiceManager::preloadImplementations() { { try { - const rtl::OUString &aLibrary = iterator->second->info->uri; + const OUString &aLibrary = iterator->second->info->uri; if (aLibrary.isEmpty()) continue; @@ -1926,7 +1926,7 @@ void cppuhelper::ServiceManager::preloadImplementations() { if (aSourceEnv.get() == aTargetEnv.get()) { // invoke function component factory - OString aImpl(rtl::OUStringToOString(iterator->second->info->name, RTL_TEXTENCODING_ASCII_US)); + OString aImpl(OUStringToOString(iterator->second->info->name, RTL_TEXTENCODING_ASCII_US)); xFactory.set(css::uno::Reference<css::uno::XInterface>(static_cast<css::uno::XInterface *>( (*fpComponentFactory)(aImpl.getStr(), this, nullptr)), SAL_NO_ACQUIRE)); } diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 2f7a749058bd..3d8a265aa750 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -71,48 +71,48 @@ public: struct ImplementationInfo { ImplementationInfo( - rtl::OUString const & theName, rtl::OUString const & theLoader, - rtl::OUString const & theUri, - rtl::OUString const & theEnvironment, - rtl::OUString const & theConstructor, - rtl::OUString const & thePrefix, + OUString const & theName, OUString const & theLoader, + OUString const & theUri, + OUString const & theEnvironment, + OUString const & theConstructor, + OUString const & thePrefix, css::uno::Reference< css::uno::XComponentContext > const & theAlienContext, - rtl::OUString const & theRdbFile): + OUString const & theRdbFile): name(theName), loader(theLoader), uri(theUri), environment(theEnvironment), constructor(theConstructor), prefix(thePrefix), alienContext(theAlienContext), rdbFile(theRdbFile) {} - explicit ImplementationInfo(rtl::OUString const & theName): + explicit ImplementationInfo(OUString const & theName): name(theName) {} ImplementationInfo(const ImplementationInfo&) = delete; const ImplementationInfo& operator=(const ImplementationInfo&) = delete; - rtl::OUString const name; - rtl::OUString const loader; - rtl::OUString const uri; - rtl::OUString const environment; - rtl::OUString const constructor; - rtl::OUString const prefix; + OUString const name; + OUString const loader; + OUString const uri; + OUString const environment; + OUString const constructor; + OUString const prefix; css::uno::Reference< css::uno::XComponentContext > const alienContext; - rtl::OUString const rdbFile; - std::vector< rtl::OUString > services; - std::vector< rtl::OUString > singletons; + OUString const rdbFile; + std::vector< OUString > services; + std::vector< OUString > singletons; }; struct Implementation { Implementation( - rtl::OUString const & name, rtl::OUString const & loader, - rtl::OUString const & uri, rtl::OUString const & environment, - rtl::OUString const & constructorName, - rtl::OUString const & prefix, + OUString const & name, OUString const & loader, + OUString const & uri, OUString const & environment, + OUString const & constructorName, + OUString const & prefix, css::uno::Reference< css::uno::XComponentContext > const & alienContext, - rtl::OUString const & rdbFile): + OUString const & rdbFile): info( new ImplementationInfo( name, loader, uri, environment, constructorName, prefix, @@ -121,7 +121,7 @@ public: {} Implementation( - rtl::OUString const & name, + OUString const & name, css::uno::Reference< css::lang::XSingleComponentFactory > const & theFactory1, css::uno::Reference< css::lang::XSingleServiceFactory > const & @@ -178,7 +178,7 @@ public: css::uno::Reference<css::uno::XInterface> const & instance); }; - typedef std::map< rtl::OUString, std::shared_ptr< Implementation > > + typedef std::map< OUString, std::shared_ptr< Implementation > > NamedImplementations; typedef @@ -189,7 +189,7 @@ public: typedef std::map< - rtl::OUString, + OUString, std::vector< std::shared_ptr< Implementation > > > ImplementationMap; @@ -207,7 +207,7 @@ public: using ServiceManagerBase::acquire; using ServiceManagerBase::release; - void init(rtl::OUString const & rdbUris); + void init(OUString const & rdbUris); void setContext( css::uno::Reference< css::uno::XComponentContext > const & context) @@ -236,32 +236,32 @@ private: virtual void SAL_CALL disposing() override; - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( - rtl::OUString const & aServiceSpecifier) override; + OUString const & aServiceSpecifier) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( - rtl::OUString const & ServiceSpecifier, + OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( - rtl::OUString const & aServiceSpecifier, + OUString const & aServiceSpecifier, css::uno::Reference< css::uno::XComponentContext > const & Context) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( - rtl::OUString const & ServiceSpecifier, + OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) override; @@ -279,43 +279,43 @@ private: virtual void SAL_CALL remove(css::uno::Any const & aElement) override; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createContentEnumeration(rtl::OUString const & aServiceName) override; + createContentEnumeration(OUString const & aServiceName) override; virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( - rtl::OUString const & aPropertyName, css::uno::Any const & aValue) override; + OUString const & aPropertyName, css::uno::Any const & aValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) override; + OUString const & PropertyName) override; virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const & aPropertyName, + OUString const & aPropertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & xListener) override; virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const & aPropertyName, + OUString const & aPropertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & aListener) override; virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const & PropertyName, + OUString const & PropertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & aListener) override; virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const & PropertyName, + OUString const & PropertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & aListener) override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override; virtual css::beans::Property SAL_CALL getPropertyByName( - rtl::OUString const & aName) override; + OUString const & aName) override; - virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name) override; + virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) override; virtual void SAL_CALL disposing(css::lang::EventObject const & Source) override; @@ -329,22 +329,22 @@ private: void removeEventListenerFromComponent( css::uno::Reference< css::lang::XComponent > const & component); - void readRdbDirectory(rtl::OUString const & uri, bool optional); + void readRdbDirectory(OUString const & uri, bool optional); - void readRdbFile(rtl::OUString const & uri, bool optional); + void readRdbFile(OUString const & uri, bool optional); - bool readLegacyRdbFile(rtl::OUString const & uri); + bool readLegacyRdbFile(OUString const & uri); - rtl::OUString readLegacyRdbString( - rtl::OUString const & uri, RegistryKey & key, - rtl::OUString const & path); + OUString readLegacyRdbString( + OUString const & uri, RegistryKey & key, + OUString const & path); void readLegacyRdbStrings( - rtl::OUString const & uri, RegistryKey & key, - rtl::OUString const & path, std::vector< rtl::OUString > * strings); + OUString const & uri, RegistryKey & key, + OUString const & path, std::vector< OUString > * strings); void insertRdbFiles( - std::vector< rtl::OUString > const & uris, + std::vector< OUString > const & uris, css::uno::Reference< css::uno::XComponentContext > const & alientContext); @@ -353,17 +353,17 @@ private: bool insertExtraData(Data const & extra); - void removeRdbFiles(std::vector< rtl::OUString > const & uris); + void removeRdbFiles(std::vector< OUString > const & uris); bool removeLegacyFactory( css::uno::Reference< css::lang::XServiceInfo > const & factoryInfo, bool removeListener); - void removeImplementation(const rtl::OUString & name); + void removeImplementation(const OUString & name); std::shared_ptr< Data::Implementation > findServiceImplementation( css::uno::Reference< css::uno::XComponentContext > const & context, - rtl::OUString const & specifier); + OUString const & specifier); void preloadImplementations(); diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index b54d45ed0773..9f23f1160c03 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -39,15 +39,15 @@ #endif css::uno::Environment cppuhelper::detail::getEnvironment( - rtl::OUString const & name, rtl::OUString const & implementation) + OUString const & name, OUString const & implementation) { - rtl::OUString n(name); + OUString n(name); if (!implementation.isEmpty()) { static char const * log = std::getenv("UNO_ENV_LOG"); if (log != nullptr && *log != 0) { - rtl::OString imps(log); + OString imps(log); for (sal_Int32 i = 0; i != -1;) { - rtl::OString imp(imps.getToken(0, ';', i)); + OString imp(imps.getToken(0, ';', i)); //TODO: this assumes UNO_ENV_LOG only contains ASCII characters: if (implementation.equalsAsciiL(imp.getStr(), imp.getLength())) { @@ -66,11 +66,11 @@ namespace { css::uno::Environment getEnvironmentFromModule( osl::Module const & module, css::uno::Environment const & target, - rtl::OUString const & implementation, rtl::OUString const & prefix) + OUString const & implementation, OUString const & prefix) { char const * name = nullptr; css::uno::Environment env; - rtl::OUString fullPrefix(prefix); + OUString fullPrefix(prefix); if (!fullPrefix.isEmpty()) { fullPrefix += "_"; } @@ -80,7 +80,7 @@ css::uno::Environment getEnvironmentFromModule( if (fp1 != nullptr) { (*fp1)( &name, reinterpret_cast<uno_Environment **>(&env), - (rtl::OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US) + (OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US) .getStr()), target.get()); } else { @@ -95,7 +95,7 @@ css::uno::Environment getEnvironmentFromModule( } if (!env.is() && name != nullptr) { env = cppuhelper::detail::getEnvironment( - rtl::OUString::createFromAscii(name), implementation); + OUString::createFromAscii(name), implementation); } return env; } @@ -104,7 +104,7 @@ css::uno::Environment getEnvironmentFromModule( extern "C" void getFactory(va_list * args) { component_getFactoryFunc fn = va_arg(*args, component_getFactoryFunc); - rtl::OString const * implementation = va_arg(*args, rtl::OString const *); + OString const * implementation = va_arg(*args, OString const *); void * smgr = va_arg(*args, void *); void ** factory = va_arg(*args, void **); *factory = (*fn)(implementation->getStr(), smgr, nullptr); @@ -112,8 +112,8 @@ extern "C" void getFactory(va_list * args) { css::uno::Reference<css::uno::XInterface> invokeComponentFactory( css::uno::Environment const & source, css::uno::Environment const & target, - component_getFactoryFunc function, rtl::OUString const & uri, - rtl::OUString const & implementation, + component_getFactoryFunc function, OUString const & uri, + OUString const & implementation, css::uno::Reference<css::lang::XMultiServiceFactory> const & serviceManager) { if (!(source.is() && target.is())) { @@ -121,8 +121,8 @@ css::uno::Reference<css::uno::XInterface> invokeComponentFactory( "cannot get environments", css::uno::Reference<css::uno::XInterface>()); } - rtl::OString impl( - rtl::OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US)); + OString impl( + OUStringToOString(implementation, RTL_TEXTENCODING_ASCII_US)); if (source.get() == target.get()) { return css::uno::Reference<css::uno::XInterface>( static_cast<css::uno::XInterface *>( @@ -230,9 +230,9 @@ cppuhelper::WrapperConstructorFn mapConstructorFn( } void cppuhelper::detail::loadSharedLibComponentFactory( - rtl::OUString const & uri, rtl::OUString const & environment, - rtl::OUString const & prefix, rtl::OUString const & implementation, - rtl::OUString const & constructor, + OUString const & uri, OUString const & environment, + OUString const & prefix, OUString const & implementation, + OUString const & constructor, css::uno::Reference<css::lang::XMultiServiceFactory> const & serviceManager, WrapperConstructorFn * constructorFunction, css::uno::Reference<css::uno::XInterface> * factory) @@ -255,7 +255,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory( if (curEnv.get() != env.get()) { std::abort();//TODO } - rtl::OUString name(prefix == "direct" ? implementation : uri); + OUString name(prefix == "direct" ? implementation : uri); SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation=" << implementation << " uri=" << uri); lib_to_factory_mapping const * map = lo_get_factory_map(); component_getFactoryFunc fp = 0; @@ -299,7 +299,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory( css::uno::Reference<css::uno::XInterface>()); } if (constructor.isEmpty()) { - rtl::OUString sym; + OUString sym; SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation=" << implementation << " uri=" << uri); if (prefix == "direct") { sym = implementation.replace('.', '_') + "_" COMPONENT_GETFACTORY; @@ -345,8 +345,8 @@ void cppuhelper::detail::loadSharedLibComponentFactory( } css::uno::Reference<css::uno::XInterface> cppu::loadSharedLibComponentFactory( - rtl::OUString const & uri, rtl::OUString const & rPath, - rtl::OUString const & rImplName, + OUString const & uri, OUString const & rPath, + OUString const & rImplName, css::uno::Reference<css::lang::XMultiServiceFactory> const & xMgr, css::uno::Reference<css::registry::XRegistryKey> const & xKey) { @@ -373,7 +373,7 @@ extern "C" void writeInfo(va_list * args) { } void cppu::writeSharedLibComponentInfo( - rtl::OUString const & uri, rtl::OUString const & rPath, + OUString const & uri, OUString const & rPath, css::uno::Reference<css::lang::XMultiServiceFactory> const & xMgr, css::uno::Reference<css::registry::XRegistryKey> const & xKey) { diff --git a/cppuhelper/source/supportsservice.cxx b/cppuhelper/source/supportsservice.cxx index 612ed37eb7a8..629981310354 100644 --- a/cppuhelper/source/supportsservice.cxx +++ b/cppuhelper/source/supportsservice.cxx @@ -18,10 +18,10 @@ #include <sal/types.h> bool cppu::supportsService( - css::lang::XServiceInfo * implementation, rtl::OUString const & name) + css::lang::XServiceInfo * implementation, OUString const & name) { assert(implementation != nullptr); - css::uno::Sequence< rtl::OUString > s( + css::uno::Sequence< OUString > s( implementation->getSupportedServiceNames()); for (sal_Int32 i = 0; i != s.getLength(); ++i) { if (s[i] == name) { diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index b4aec385c956..a6336cab7833 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -56,8 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::reflection; -using rtl::OUString; - namespace cppu { diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index ed811f03c44f..15702e624e59 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -55,8 +55,6 @@ #include <sal/macros.h> #include <sal/types.h> -using rtl::OUString; - #include <unoidl/unoidl.hxx> #include "paths.hxx" @@ -64,7 +62,7 @@ using rtl::OUString; namespace { -rtl::OUString makePrefix(rtl::OUString const & name) { +OUString makePrefix(OUString const & name) { return name.isEmpty() ? name : name + "."; } @@ -84,7 +82,7 @@ class SimpleTypeDescription: { public: SimpleTypeDescription( - css::uno::TypeClass typeClass, rtl::OUString const & name): + css::uno::TypeClass typeClass, OUString const & name): typeClass_(typeClass), name_(name) {} @@ -94,11 +92,11 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return typeClass_; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } css::uno::TypeClass typeClass_; - rtl::OUString name_; + OUString name_; }; class SequenceTypeDescription: @@ -107,7 +105,7 @@ class SequenceTypeDescription: public: SequenceTypeDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, rtl::OUString const & componentType): + OUString const & name, OUString const & componentType): manager_(manager), name_(name), componentType_(componentType) { assert(manager.is()); } @@ -117,7 +115,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_SEQUENCE; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -125,8 +123,8 @@ private: { return manager_->resolve(componentType_); } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; - rtl::OUString componentType_; + OUString name_; + OUString componentType_; }; class PublishableDescription: @@ -150,7 +148,7 @@ class ModuleDescription: public: ModuleDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::ModuleEntity > const & entity): manager_(manager), name_(name), entity_(entity) { assert(manager.is()); assert(entity.is()); } @@ -161,7 +159,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_MODULE; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual @@ -170,14 +168,14 @@ private: SAL_CALL getMembers() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::ModuleEntity > entity_; }; css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > ModuleDescription::getMembers() { try { - std::vector< rtl::OUString > names(entity_->getMemberNames()); + std::vector< OUString > names(entity_->getMemberNames()); assert(names.size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(names.size()); css::uno::Sequence< @@ -200,7 +198,7 @@ EnumTypeDescription_Base; class EnumTypeDescription: public EnumTypeDescription_Base { public: EnumTypeDescription( - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::EnumTypeEntity > const & entity): EnumTypeDescription_Base(entity->isPublished()), name_(name), entity_(entity) @@ -212,25 +210,25 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_ENUM; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual sal_Int32 SAL_CALL getDefaultEnumValue() override { return entity_->getMembers()[0].value; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() override; + virtual css::uno::Sequence< OUString > SAL_CALL getEnumNames() override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() override; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::EnumTypeEntity > entity_; }; -css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames() +css::uno::Sequence< OUString > EnumTypeDescription::getEnumNames() { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); - css::uno::Sequence< rtl::OUString > s(n); + css::uno::Sequence< OUString > s(n); for (sal_Int32 i = 0; i != n; ++i) { s[i] = entity_->getMembers()[i].name; } @@ -256,7 +254,7 @@ class PlainStructTypeDescription: public PlainStructTypeDescription_Base { public: PlainStructTypeDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::PlainStructTypeEntity > const & entity): PlainStructTypeDescription_Base(entity->isPublished()), manager_(manager), name_(name), entity_(entity) @@ -268,7 +266,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -283,10 +281,10 @@ private: css::uno::Reference< css::reflection::XTypeDescription > > SAL_CALL getMemberTypes() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override; + virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override - { return css::uno::Sequence< rtl::OUString >(); } + virtual css::uno::Sequence< OUString > SAL_CALL getTypeParameters() override + { return css::uno::Sequence< OUString >(); } virtual css::uno::Sequence< @@ -297,7 +295,7 @@ private: } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::PlainStructTypeEntity > entity_; }; @@ -314,11 +312,11 @@ PlainStructTypeDescription::getMemberTypes() return s; } -css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames() +css::uno::Sequence< OUString > PlainStructTypeDescription::getMemberNames() { assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size()); - css::uno::Sequence< rtl::OUString > s(n); + css::uno::Sequence< OUString > s(n); for (sal_Int32 i = 0; i != n; ++i) { s[i] = entity_->getDirectMembers()[i].name; } @@ -330,7 +328,7 @@ class ParameterizedMemberTypeDescription: { public: explicit ParameterizedMemberTypeDescription( - rtl::OUString const & typeParameterName): + OUString const & typeParameterName): typeParameterName_(typeParameterName) {} @@ -340,10 +338,10 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_UNKNOWN; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return typeParameterName_; } - rtl::OUString typeParameterName_; + OUString typeParameterName_; }; typedef cppu::ImplInheritanceHelper< @@ -356,7 +354,7 @@ class PolymorphicStructTypeTemplateDescription: public: PolymorphicStructTypeTemplateDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const & entity): PolymorphicStructTypeTemplateDescription_Base(entity->isPublished()), @@ -369,7 +367,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -381,9 +379,9 @@ private: css::uno::Reference< css::reflection::XTypeDescription > > SAL_CALL getMemberTypes() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override; + virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override; + virtual css::uno::Sequence< OUString > SAL_CALL getTypeParameters() override; virtual css::uno::Sequence< @@ -394,7 +392,7 @@ private: } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_; }; @@ -414,24 +412,24 @@ PolymorphicStructTypeTemplateDescription::getMemberTypes() return s; } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > PolymorphicStructTypeTemplateDescription::getMemberNames() { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); - css::uno::Sequence< rtl::OUString > s(n); + css::uno::Sequence< OUString > s(n); for (sal_Int32 i = 0; i != n; ++i) { s[i] = entity_->getMembers()[i].name; } return s; } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > PolymorphicStructTypeTemplateDescription::getTypeParameters() { assert(entity_->getTypeParameters().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getTypeParameters().size()); - css::uno::Sequence< rtl::OUString > s(n); + css::uno::Sequence< OUString > s(n); for (sal_Int32 i = 0; i != n; ++i) { s[i] = entity_->getTypeParameters()[i]; } @@ -444,10 +442,10 @@ class InstantiatedPolymorphicStructTypeDescription: public: InstantiatedPolymorphicStructTypeDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const & entity, - std::vector< rtl::OUString > const & arguments): + std::vector< OUString > const & arguments): manager_(manager), name_(name), entity_(entity), arguments_(arguments) { assert(manager.is()); @@ -461,7 +459,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -473,10 +471,10 @@ private: css::uno::Reference< css::reflection::XTypeDescription > > SAL_CALL getMemberTypes() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override; + virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override - { return css::uno::Sequence< rtl::OUString >(); } + virtual css::uno::Sequence< OUString > SAL_CALL getTypeParameters() override + { return css::uno::Sequence< OUString >(); } virtual css::uno::Sequence< @@ -484,9 +482,9 @@ private: SAL_CALL getTypeArguments() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_; - std::vector< rtl::OUString > arguments_; + std::vector< OUString > arguments_; }; css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > @@ -497,9 +495,9 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes() css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > s(n); for (sal_Int32 i = 0; i != n; ++i) { - rtl::OUString type(entity_->getMembers()[i].type); + OUString type(entity_->getMembers()[i].type); if (entity_->getMembers()[i].parameterized) { - for (std::vector< rtl::OUString >::const_iterator j( + for (std::vector< OUString >::const_iterator j( entity_->getTypeParameters().begin()); j != entity_->getTypeParameters().end(); ++j) { @@ -516,12 +514,12 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes() return s; } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > InstantiatedPolymorphicStructTypeDescription::getMemberNames() { assert(entity_->getMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size()); - css::uno::Sequence< rtl::OUString > s(n); + css::uno::Sequence< OUString > s(n); for (sal_Int32 i = 0; i != n; ++i) { s[i] = entity_->getMembers()[i].name; } @@ -548,7 +546,7 @@ class ExceptionTypeDescription: public ExceptionTypeDescription_Base { public: ExceptionTypeDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::ExceptionTypeEntity > const & entity): ExceptionTypeDescription_Base(entity->isPublished()), manager_(manager), name_(name), entity_(entity) @@ -560,7 +558,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_EXCEPTION; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -575,10 +573,10 @@ private: css::uno::Reference< css::reflection::XTypeDescription > > SAL_CALL getMemberTypes() override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override; + virtual css::uno::Sequence< OUString > SAL_CALL getMemberNames() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::ExceptionTypeEntity > entity_; }; @@ -594,11 +592,11 @@ ExceptionTypeDescription::getMemberTypes() { return s; } -css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames() +css::uno::Sequence< OUString > ExceptionTypeDescription::getMemberNames() { assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32); sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size()); - css::uno::Sequence< rtl::OUString > s(n); + css::uno::Sequence< OUString > s(n); for (sal_Int32 i = 0; i != n; ++i) { s[i] = entity_->getDirectMembers()[i].name; } @@ -612,7 +610,7 @@ class AttributeDescription: public: AttributeDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, unoidl::InterfaceTypeEntity::Attribute const & attribute, sal_Int32 position): manager_(manager), name_(name), attribute_(attribute), @@ -625,10 +623,10 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_INTERFACE_ATTRIBUTE; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } - virtual rtl::OUString SAL_CALL getMemberName() override + virtual OUString SAL_CALL getMemberName() override { return attribute_.name; } virtual sal_Int32 SAL_CALL getPosition() override @@ -655,7 +653,7 @@ private: SAL_CALL getSetExceptions() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; unoidl::InterfaceTypeEntity::Attribute attribute_; sal_Int32 position_; }; @@ -704,7 +702,7 @@ public: private: virtual ~MethodParameter() override {} - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -744,7 +742,7 @@ class MethodDescription: public: MethodDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, unoidl::InterfaceTypeEntity::Method const & method, sal_Int32 position): manager_(manager), name_(name), method_(method), position_(position) { assert(manager.is()); } @@ -755,10 +753,10 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_INTERFACE_METHOD; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } - virtual rtl::OUString SAL_CALL getMemberName() override + virtual OUString SAL_CALL getMemberName() override { return method_.name; } virtual sal_Int32 SAL_CALL getPosition() override @@ -782,7 +780,7 @@ private: SAL_CALL getExceptions() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; unoidl::InterfaceTypeEntity::Method method_; sal_Int32 position_; }; @@ -831,7 +829,7 @@ private: css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > const & description); - std::set< rtl::OUString > set_; + std::set< OUString > set_; sal_Int32 offset_; }; @@ -876,7 +874,7 @@ class InterfaceTypeDescription: public InterfaceTypeDescription_Base { public: InterfaceTypeDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::InterfaceTypeEntity > const & entity): InterfaceTypeDescription_Base(entity->isPublished()), manager_(manager), name_(name), entity_(entity) @@ -888,7 +886,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_INTERFACE; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -918,7 +916,7 @@ private: SAL_CALL getOptionalBaseTypes() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::InterfaceTypeEntity > entity_; }; @@ -981,7 +979,7 @@ class ConstantDescription: { public: ConstantDescription( - rtl::OUString const & constantGroupName, + OUString const & constantGroupName, unoidl::ConstantGroupEntity::Member const & member); private: @@ -990,18 +988,18 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_CONSTANT; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Any SAL_CALL getConstantValue() override { return value_; } - rtl::OUString name_; + OUString name_; css::uno::Any value_; }; ConstantDescription::ConstantDescription( - rtl::OUString const & constantGroupName, + OUString const & constantGroupName, unoidl::ConstantGroupEntity::Member const & member): name_(makePrefix(constantGroupName) + member.name) { @@ -1048,7 +1046,7 @@ ConstantGroupDescription_Base; class ConstantGroupDescription: public ConstantGroupDescription_Base { public: ConstantGroupDescription( - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::ConstantGroupEntity > const & entity): ConstantGroupDescription_Base(entity->isPublished()), name_(name), entity_(entity) @@ -1060,7 +1058,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_CONSTANTS; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual @@ -1068,7 +1066,7 @@ private: css::uno::Reference< css::reflection::XConstantTypeDescription > > SAL_CALL getConstants() override; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::ConstantGroupEntity > entity_; }; @@ -1093,7 +1091,7 @@ class TypedefDescription: public TypedefDescription_Base { public: TypedefDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::TypedefEntity > const & entity): TypedefDescription_Base(entity->isPublished()), manager_(manager), name_(name), entity_(entity) @@ -1105,7 +1103,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_TYPEDEF; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -1113,7 +1111,7 @@ private: { return manager_->resolve(entity_->getType()); } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::TypedefEntity > entity_; }; @@ -1132,7 +1130,7 @@ public: private: virtual ~ConstructorParameter() override {} - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL @@ -1175,7 +1173,7 @@ private: virtual sal_Bool SAL_CALL isDefaultConstructor() override { return constructor_.defaultConstructor; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return constructor_.name; } virtual @@ -1230,7 +1228,7 @@ class SingleInterfaceBasedServiceDescription: public: SingleInterfaceBasedServiceDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > const & entity): SingleInterfaceBasedServiceDescription_Base(entity->isPublished()), @@ -1243,7 +1241,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual @@ -1307,7 +1305,7 @@ private: SAL_CALL getConstructors() override; rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > entity_; }; @@ -1343,7 +1341,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_PROPERTY; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return property_.name; } virtual sal_Int16 SAL_CALL getPropertyFlags() override @@ -1367,7 +1365,7 @@ class AccumulationBasedServiceDescription: public: AccumulationBasedServiceDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::AccumulationBasedServiceEntity > const & entity): AccumulationBasedServiceDescription_Base(entity->isPublished()), @@ -1380,7 +1378,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual @@ -1426,7 +1424,7 @@ private: } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::AccumulationBasedServiceEntity > entity_; }; @@ -1531,7 +1529,7 @@ class InterfaceBasedSingletonDescription: public: InterfaceBasedSingletonDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::InterfaceBasedSingletonEntity > const & entity): InterfaceBasedSingletonDescription_Base(entity->isPublished()), manager_(manager), name_(name), entity_(entity) @@ -1543,7 +1541,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > @@ -1561,7 +1559,7 @@ private: { return manager_->resolve(entity_->getBase()); } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_; }; @@ -1575,7 +1573,7 @@ class ServiceBasedSingletonDescription: public: ServiceBasedSingletonDescription( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::ServiceBasedSingletonEntity > const & entity): ServiceBasedSingletonDescription_Base(entity_->isPublished()), manager_(manager), name_(name), entity_(entity) @@ -1587,7 +1585,7 @@ private: virtual css::uno::TypeClass SAL_CALL getTypeClass() override { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() override + virtual OUString SAL_CALL getName() override { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > @@ -1605,7 +1603,7 @@ private: { return css::uno::Reference< css::reflection::XTypeDescription >(); } rtl::Reference< cppuhelper::TypeManager > manager_; - rtl::OUString name_; + OUString name_; rtl::Reference< unoidl::ServiceBasedSingletonEntity > entity_; }; @@ -1615,7 +1613,7 @@ class Enumeration: public: Enumeration( rtl::Reference< cppuhelper::TypeManager > const & manager, - rtl::OUString const & prefix, + OUString const & prefix, rtl::Reference< unoidl::MapCursor > const & cursor, css::uno::Sequence< css::uno::TypeClass > const & types, bool deep): manager_(manager), types_(types), deep_(deep) @@ -1643,13 +1641,13 @@ private: struct Position { Position( - rtl::OUString const & thePrefix, + OUString const & thePrefix, rtl::Reference< unoidl::MapCursor > const & theCursor): prefix(thePrefix), cursor(theCursor) { assert(theCursor.is()); } Position( - rtl::OUString const & thePrefix, + OUString const & thePrefix, rtl::Reference< unoidl::ConstantGroupEntity > const & theConstantGroup): prefix(thePrefix), constantGroup(theConstantGroup), @@ -1665,7 +1663,7 @@ private: } } - rtl::OUString prefix; + OUString prefix; rtl::Reference< unoidl::MapCursor > cursor; rtl::Reference< unoidl::ConstantGroupEntity > constantGroup; std::vector< unoidl::ConstantGroupEntity::Member >::const_iterator @@ -1678,13 +1676,13 @@ private: osl::Mutex mutex_; std::stack< Position > positions_; - rtl::OUString current_; + OUString current_; }; css::uno::Reference< css::reflection::XTypeDescription > Enumeration::nextTypeDescription() { - rtl::OUString name; + OUString name; { osl::MutexGuard g(mutex_); if (positions_.empty()) { @@ -1714,7 +1712,7 @@ void Enumeration::findNextMatch() { try { for (;;) { assert(!positions_.empty()); - rtl::OUString name; + OUString name; if (positions_.top().cursor.is()) { // root or module rtl::Reference< unoidl::Entity > ent( positions_.top().cursor->getNext(&name)); @@ -1808,7 +1806,7 @@ cppuhelper::TypeManager::TypeManager(): manager_(new unoidl::Manager) {} -css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) { +css::uno::Any cppuhelper::TypeManager::find(OUString const & name) { //TODO: caching? (here or in unoidl::Manager?) struct Simple { OUStringLiteral name; @@ -1856,7 +1854,7 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) { } i = name.lastIndexOf('.'); if (i != -1) { - rtl::OUString parent(name.copy(0, i)); + OUString parent(name.copy(0, i)); ent = findEntity(parent); if (ent.is()) { switch (ent->getSort()) { @@ -1878,7 +1876,7 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) { } css::uno::Reference< css::reflection::XTypeDescription > -cppuhelper::TypeManager::resolve(rtl::OUString const & name) { +cppuhelper::TypeManager::resolve(OUString const & name) { css::uno::Reference< css::reflection::XTypeDescription > desc( find(name), css::uno::UNO_QUERY); if (!desc.is()) { @@ -1893,19 +1891,19 @@ cppuhelper::TypeManager::~TypeManager() throw () {} void cppuhelper::TypeManager::disposing() {} //TODO -rtl::OUString cppuhelper::TypeManager::getImplementationName() +OUString cppuhelper::TypeManager::getImplementationName() { - return rtl::OUString( + return OUString( "com.sun.star.comp.cppuhelper.bootstrap.TypeManager"); } sal_Bool cppuhelper::TypeManager::supportsService( - rtl::OUString const & ServiceName) + OUString const & ServiceName) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > cppuhelper::TypeManager::getSupportedServiceNames() { css::uno::Sequence<OUString> names { "com.sun.star.reflection.TypeDescriptionManager" }; //TODO @@ -1913,7 +1911,7 @@ cppuhelper::TypeManager::getSupportedServiceNames() } css::uno::Any cppuhelper::TypeManager::getByHierarchicalName( - rtl::OUString const & aName) + OUString const & aName) { css::uno::Any desc(find(aName)); if (!desc.hasValue()) { @@ -1924,14 +1922,14 @@ css::uno::Any cppuhelper::TypeManager::getByHierarchicalName( } sal_Bool cppuhelper::TypeManager::hasByHierarchicalName( - rtl::OUString const & aName) + OUString const & aName) { return find(aName).hasValue(); } css::uno::Type cppuhelper::TypeManager::getElementType() { - return cppu::UnoType< rtl::OUString >::get(); + return cppu::UnoType< OUString >::get(); } sal_Bool cppuhelper::TypeManager::hasElements() @@ -1958,7 +1956,7 @@ sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &) void cppuhelper::TypeManager::insert(css::uno::Any const & aElement) { - rtl::OUString uri; + OUString uri; if (!(aElement >>= uri)) { throw css::lang::IllegalArgumentException( ("css.uno.theTypeDescriptionManager.insert expects a string URI" @@ -1972,7 +1970,7 @@ void cppuhelper::TypeManager::insert(css::uno::Any const & aElement) void cppuhelper::TypeManager::remove(css::uno::Any const & aElement) { - rtl::OUString uri; + OUString uri; if (!(aElement >>= uri)) { throw css::lang::IllegalArgumentException( ("css.uno.theTypeDescriptionManager.remove expects a string URI" @@ -1984,7 +1982,7 @@ void cppuhelper::TypeManager::remove(css::uno::Any const & aElement) css::uno::Reference< css::reflection::XTypeDescriptionEnumeration > cppuhelper::TypeManager::createTypeDescriptionEnumeration( - rtl::OUString const & moduleName, + OUString const & moduleName, css::uno::Sequence< css::uno::TypeClass > const & types, css::reflection::TypeDescriptionSearchDepth depth) { @@ -2008,9 +2006,9 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration( depth == css::reflection::TypeDescriptionSearchDepth_INFINITE); } -void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) { +void cppuhelper::TypeManager::init(OUString const & rdbUris) { for (sal_Int32 i = 0; i != -1;) { - rtl::OUString uri(rdbUris.getToken(0, ' ', i)); + OUString uri(rdbUris.getToken(0, ' ', i)); if (uri.isEmpty()) { continue; } @@ -2026,7 +2024,7 @@ void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) { } void cppuhelper::TypeManager::readRdbDirectory( - rtl::OUString const & uri, bool optional) + OUString const & uri, bool optional) { osl::Directory dir(uri); switch (dir.open()) { @@ -2044,7 +2042,7 @@ void cppuhelper::TypeManager::readRdbDirectory( static_cast< cppu::OWeakObject * >(this)); } for (;;) { - rtl::OUString url; + OUString url; if (!cppu::nextDirectoryItem(dir, &url)) { break; } @@ -2053,7 +2051,7 @@ void cppuhelper::TypeManager::readRdbDirectory( } void cppuhelper::TypeManager::readRdbFile( - rtl::OUString const & uri, bool optional) + OUString const & uri, bool optional) { try { manager_->addProvider(uri); @@ -2073,7 +2071,7 @@ void cppuhelper::TypeManager::readRdbFile( } css::uno::Any cppuhelper::TypeManager::getSequenceType( - rtl::OUString const & name) + OUString const & name) { assert(name.startsWith("[]")); return css::uno::makeAny< @@ -2083,7 +2081,7 @@ css::uno::Any cppuhelper::TypeManager::getSequenceType( } css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct( - rtl::OUString const & name, sal_Int32 separator) + OUString const & name, sal_Int32 separator) { assert(name.indexOf('<') == separator && separator != -1); rtl::Reference< unoidl::Entity > ent(findEntity(name.copy(0, separator))); @@ -2096,7 +2094,7 @@ css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct( rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > ent2( static_cast< unoidl::PolymorphicStructTypeTemplateEntity * >( ent.get())); - std::vector< rtl::OUString > args; + std::vector< OUString > args; sal_Int32 i = separator; do { ++i; // skip '<' or ',' @@ -2133,7 +2131,7 @@ css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct( } css::uno::Any cppuhelper::TypeManager::getInterfaceMember( - rtl::OUString const & name, sal_Int32 separator) + OUString const & name, sal_Int32 separator) { assert(name.indexOf("::") == separator && separator != -1); css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc( @@ -2141,7 +2139,7 @@ css::uno::Any cppuhelper::TypeManager::getInterfaceMember( if (!ifc.is()) { return css::uno::Any(); } - rtl::OUString member(name.copy(separator + std::strlen("::"))); + OUString member(name.copy(separator + std::strlen("::"))); css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > > mems( @@ -2157,7 +2155,7 @@ css::uno::Any cppuhelper::TypeManager::getInterfaceMember( } css::uno::Any cppuhelper::TypeManager::getNamed( - rtl::OUString const & name, rtl::Reference< unoidl::Entity > const & entity) + OUString const & name, rtl::Reference< unoidl::Entity > const & entity) { assert(entity.is()); switch (entity->getSort()) { @@ -2250,7 +2248,7 @@ css::uno::Any cppuhelper::TypeManager::getNamed( css::uno::Any cppuhelper::TypeManager::getEnumMember( rtl::Reference< unoidl::EnumTypeEntity > const & entity, - rtl::OUString const & member) + OUString const & member) { for (std::vector< unoidl::EnumTypeEntity::Member >::const_iterator i( entity->getMembers().begin()); @@ -2264,9 +2262,9 @@ css::uno::Any cppuhelper::TypeManager::getEnumMember( } css::uno::Any cppuhelper::TypeManager::getConstant( - rtl::OUString const & constantGroupName, + OUString const & constantGroupName, rtl::Reference< unoidl::ConstantGroupEntity > const & entity, - rtl::OUString const & member) + OUString const & member) { for (std::vector< unoidl::ConstantGroupEntity::Member >::const_iterator i( entity->getMembers().begin()); @@ -2282,7 +2280,7 @@ css::uno::Any cppuhelper::TypeManager::getConstant( } rtl::Reference< unoidl::Entity > cppuhelper::TypeManager::findEntity( - rtl::OUString const & name) + OUString const & name) { try { return manager_->findEntity(name); diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index 2ad52f836ff3..f2784aa0ea59 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -56,29 +56,29 @@ public: using TypeManager_Base::acquire; using TypeManager_Base::release; - void init(rtl::OUString const & rdbUris); + void init(OUString const & rdbUris); - css::uno::Any find(rtl::OUString const & name); + css::uno::Any find(OUString const & name); css::uno::Reference< css::reflection::XTypeDescription > resolve( - rtl::OUString const & name); + OUString const & name); private: virtual ~TypeManager() throw () override; virtual void SAL_CALL disposing() override; - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Any SAL_CALL getByHierarchicalName( - rtl::OUString const & aName) override; + OUString const & aName) override; - virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName) override; + virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override; virtual css::uno::Type SAL_CALL getElementType() override; @@ -95,36 +95,36 @@ private: virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( - rtl::OUString const & moduleName, + OUString const & moduleName, css::uno::Sequence< css::uno::TypeClass > const & types, css::reflection::TypeDescriptionSearchDepth depth) override; - void readRdbDirectory(rtl::OUString const & uri, bool optional); + void readRdbDirectory(OUString const & uri, bool optional); - void readRdbFile(rtl::OUString const & uri, bool optional); + void readRdbFile(OUString const & uri, bool optional); - css::uno::Any getSequenceType(rtl::OUString const & name); + css::uno::Any getSequenceType(OUString const & name); css::uno::Any getInstantiatedStruct( - rtl::OUString const & name, sal_Int32 separator); + OUString const & name, sal_Int32 separator); css::uno::Any getInterfaceMember( - rtl::OUString const & name, sal_Int32 separator); + OUString const & name, sal_Int32 separator); css::uno::Any getNamed( - rtl::OUString const & name, + OUString const & name, rtl::Reference< unoidl::Entity > const & entity); static css::uno::Any getEnumMember( rtl::Reference< unoidl::EnumTypeEntity > const & entity, - rtl::OUString const & member); + OUString const & member); static css::uno::Any getConstant( - rtl::OUString const & constantGroupName, + OUString const & constantGroupName, rtl::Reference< unoidl::ConstantGroupEntity > const & entity, - rtl::OUString const & member); + OUString const & member); - rtl::Reference< unoidl::Entity > findEntity(rtl::OUString const & name); + rtl::Reference< unoidl::Entity > findEntity(OUString const & name); rtl::Reference< unoidl::Manager > manager_; }; diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index f131a81f68a6..c01c83cfa6dd 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -39,26 +39,26 @@ using cppu::UnoUrlDescriptor; class UnoUrlDescriptor::Impl { public: - typedef std::map< rtl::OUString, rtl::OUString > Parameters; + typedef std::map< OUString, OUString > Parameters; - rtl::OUString m_aDescriptor; - rtl::OUString m_aName; + OUString m_aDescriptor; + OUString m_aName; Parameters m_aParameters; /** @exception rtl::MalformedUriException */ - explicit inline Impl(rtl::OUString const & m_aDescriptor); + explicit inline Impl(OUString const & m_aDescriptor); Impl * clone() const { return new Impl(*this); } }; -inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) +inline UnoUrlDescriptor::Impl::Impl(OUString const & rDescriptor) { m_aDescriptor = rDescriptor; enum State { STATE_NAME0, STATE_NAME, STATE_KEY0, STATE_KEY, STATE_VALUE }; State eState = STATE_NAME0; sal_Int32 nStart = 0; - rtl::OUString aKey; + OUString aKey; for (sal_Int32 i = 0;; ++i) { bool bEnd = i == rDescriptor.getLength(); @@ -125,7 +125,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) } } -UnoUrlDescriptor::UnoUrlDescriptor(rtl::OUString const & rDescriptor): +UnoUrlDescriptor::UnoUrlDescriptor(OUString const & rDescriptor): m_pImpl(new Impl(rDescriptor)) {} @@ -149,27 +149,27 @@ UnoUrlDescriptor & UnoUrlDescriptor::operator =(UnoUrlDescriptor const & rOther) return *this; } -rtl::OUString const & UnoUrlDescriptor::getDescriptor() const +OUString const & UnoUrlDescriptor::getDescriptor() const { return m_pImpl->m_aDescriptor; } -rtl::OUString const & UnoUrlDescriptor::getName() const +OUString const & UnoUrlDescriptor::getName() const { return m_pImpl->m_aName; } -bool UnoUrlDescriptor::hasParameter(rtl::OUString const & rKey) const +bool UnoUrlDescriptor::hasParameter(OUString const & rKey) const { return m_pImpl->m_aParameters.find(rKey.toAsciiLowerCase()) != m_pImpl->m_aParameters.end(); } -rtl::OUString UnoUrlDescriptor::getParameter(rtl::OUString const & rKey) const +OUString UnoUrlDescriptor::getParameter(OUString const & rKey) const { Impl::Parameters::const_iterator aIt(m_pImpl->m_aParameters.find(rKey.toAsciiLowerCase())); - return aIt == m_pImpl->m_aParameters.end() ? rtl::OUString() : aIt->second; + return aIt == m_pImpl->m_aParameters.end() ? OUString() : aIt->second; } class UnoUrl::Impl @@ -177,25 +177,25 @@ class UnoUrl::Impl public: UnoUrlDescriptor m_aConnection; UnoUrlDescriptor m_aProtocol; - rtl::OUString m_aObjectName; + OUString m_aObjectName; Impl * clone() const { return new Impl(*this); } /** @exception rtl::MalformedUriException */ - static inline Impl * create(rtl::OUString const & rUrl); + static inline Impl * create(OUString const & rUrl); private: - Impl(rtl::OUString const & rConnectionDescriptor, - rtl::OUString const & rProtocolDescriptor, - rtl::OUString const & rObjectName): + Impl(OUString const & rConnectionDescriptor, + OUString const & rProtocolDescriptor, + OUString const & rObjectName): m_aConnection(rConnectionDescriptor), m_aProtocol(rProtocolDescriptor), m_aObjectName(rObjectName) {} }; -inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) +inline UnoUrl::Impl * UnoUrl::Impl::create(OUString const & rUrl) { if (!rUrl.startsWithIgnoreAsciiCase("uno:")) throw rtl::MalformedUriException("UNO URL does not start with \"uno:\""); @@ -203,12 +203,12 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) sal_Int32 j = rUrl.indexOf(';', i); if (j < 0) throw rtl::MalformedUriException("UNO URL has too few semicolons"); - rtl::OUString aConnection(rUrl.copy(i, j - i)); + OUString aConnection(rUrl.copy(i, j - i)); i = j + 1; j = rUrl.indexOf(0x3B, i); // ';' if (j < 0) throw rtl::MalformedUriException("UNO URL has too few semicolons"); - rtl::OUString aProtocol(rUrl.copy(i, j - i)); + OUString aProtocol(rUrl.copy(i, j - i)); i = j + 1; if (i == rUrl.getLength()) throw rtl::MalformedUriException("UNO URL contains empty ObjectName"); @@ -227,7 +227,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) return new Impl(aConnection, aProtocol, rUrl.copy(i)); } -UnoUrl::UnoUrl(rtl::OUString const & rUrl): m_pImpl(Impl::create(rUrl)) +UnoUrl::UnoUrl(OUString const & rUrl): m_pImpl(Impl::create(rUrl)) {} UnoUrl::UnoUrl(UnoUrl const & rOther): m_pImpl(rOther.m_pImpl->clone()) @@ -259,7 +259,7 @@ UnoUrlDescriptor const & UnoUrl::getProtocol() const return m_pImpl->m_aProtocol; } -rtl::OUString const & UnoUrl::getObjectName() const +OUString const & UnoUrl::getObjectName() const { return m_pImpl->m_aObjectName; } diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx index 58579cd39c25..74d8a360cc53 100644 --- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx +++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx @@ -83,7 +83,7 @@ OUString lcl_double_dabble(const std::vector<sal_uInt8>& bytes) digit += '0'; /* Resize and return the resulting string. */ - return rtl::OStringToOUString(OString(scratch.data(), scratch.size()), RTL_TEXTENCODING_UTF8); + return OStringToOUString(OString(scratch.data(), scratch.size()), RTL_TEXTENCODING_UTF8); } OUString lcl_makeStringFromBigint(const std::vector<sal_uInt8>& bytes) diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 0745116b07ac..52f96dd84d88 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -218,7 +218,7 @@ CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curE if (!SkipNewline(pPos)) return curEvt; - rtl::OStringBuffer aResult(static_cast<unsigned int>(nRead)); + OStringBuffer aResult(static_cast<unsigned int>(nRead)); do { const char* pPos1 = pPos; diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index 29001367bb91..4a702f4420bd 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -46,8 +46,8 @@ namespace { void writeToStream(std::ofstream& strm, const OUString& rKey, const OUString& rValue) { - strm << rtl::OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "="; - strm << rtl::OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n"; + strm << OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "="; + strm << OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n"; } } diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index d45b6ab12f9d..3ae3c7d57269 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -92,7 +92,7 @@ struct DispatchHolder namespace { -std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUString& rUrl, const rtl::OUString& rFactory ) +std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const OUString& rUrl, const OUString& rFactory ) { // create the list of filters OUStringBuffer sQuery(256); @@ -116,7 +116,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr while ( xFilterEnum->hasMoreElements() ) { comphelper::SequenceAsHashMap aFilterProps( xFilterEnum->nextElement() ); - const rtl::OUString aName( aFilterProps.getUnpackedValueOrDefault( "Name", rtl::OUString() ) ); + const OUString aName( aFilterProps.getUnpackedValueOrDefault( "Name", OUString() ) ); if ( !aName.isEmpty() ) { std::shared_ptr<const SfxFilter> pFilter( SfxFilter::GetFilterByName( aName ) ); @@ -132,7 +132,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr } std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl( - const rtl::OUString& rUrl, const rtl::OUString& rFactory) + const OUString& rUrl, const OUString& rFactory) { try { @@ -140,7 +140,7 @@ std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl( const Reference< document::XTypeDetection > xTypeDetector( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", xContext ), UNO_QUERY_THROW ); - const rtl::OUString aTypeName( xTypeDetector->queryTypeByURL( rUrl ) ); + const OUString aTypeName( xTypeDetector->queryTypeByURL( rUrl ) ); std::shared_ptr<const SfxFilter> pFilter( SfxFilterMatcher( rFactory ).GetFilter4EA( aTypeName, SfxFilterFlags::EXPORT ) ); if ( !pFilter ) @@ -217,9 +217,9 @@ void scriptCat(const Reference< XModel >& xDoc ) std::cout << aObjectNames.getLength() << "\n\n"; for ( sal_Int32 j = 0 ; j < aObjectNames.getLength() ; ++j ) { - rtl::OUString &rObjectName = aObjectNames[j]; + OUString &rObjectName = aObjectNames[j]; - rtl::OUString aCodeString; + OUString aCodeString; try { Any aCode = xContainer->getByName( rObjectName ); diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 0f12544b6a6b..c72ad4b91508 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -69,9 +69,9 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } - static rtl::OUString SAL_CALL static_getImplementationName(); + static OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< rtl::OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL static_getSupportedServiceNames(); private: @@ -81,18 +81,18 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() override + virtual OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) override; + css::util::URL const &, OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( @@ -101,18 +101,18 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -rtl::OUString Provider::static_getImplementationName() { - return rtl::OUString("com.sun.star.comp.test.deployment.active_native"); +OUString Provider::static_getImplementationName() { + return OUString("com.sun.star.comp.test.deployment.active_native"); } -css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() +css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames() { - rtl::OUString name("com.sun.star.test.deployment.active_native"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + OUString name("com.sun.star.test.deployment.active_native"); + return css::uno::Sequence< OUString >(&name, 1); } css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) + css::util::URL const &, OUString const &, sal_Int32) { css::uno::Reference< css::frame::XDispatch > dispatch; if (!(context_->getValueByName( @@ -156,11 +156,11 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } - static rtl::OUString SAL_CALL static_getImplementationName(); + static OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< rtl::OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL static_getSupportedServiceNames() - { return css::uno::Sequence< rtl::OUString >(); } + { return css::uno::Sequence< OUString >(); } private: explicit Dispatch( @@ -169,13 +169,13 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() override + virtual OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return static_getSupportedServiceNames(); } @@ -196,8 +196,8 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -rtl::OUString Dispatch::static_getImplementationName() { - return rtl::OUString( +OUString Dispatch::static_getImplementationName() { + return OUString( "com.sun.star.comp.test.deployment.active_native_singleton"); } diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 83b955a00313..ea62f7b0112f 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -66,9 +66,9 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } - static rtl::OUString SAL_CALL static_getImplementationName(); + static OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< rtl::OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL static_getSupportedServiceNames(); private: @@ -78,18 +78,18 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() override + virtual OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) override; + css::util::URL const &, OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( @@ -98,18 +98,18 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -rtl::OUString Provider::static_getImplementationName() { - return rtl::OUString("com.sun.star.comp.test.deployment.passive_native"); +OUString Provider::static_getImplementationName() { + return OUString("com.sun.star.comp.test.deployment.passive_native"); } -css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() +css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames() { - rtl::OUString name("com.sun.star.test.deployment.passive_native"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + OUString name("com.sun.star.test.deployment.passive_native"); + return css::uno::Sequence< OUString >(&name, 1); } css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) + css::util::URL const &, OUString const &, sal_Int32) { css::uno::Reference< css::frame::XDispatch > dispatch; if (!(context_->getValueByName( @@ -153,11 +153,11 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } - static rtl::OUString SAL_CALL static_getImplementationName(); + static OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< rtl::OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL static_getSupportedServiceNames() - { return css::uno::Sequence< rtl::OUString >(); } + { return css::uno::Sequence< OUString >(); } private: explicit Dispatch( @@ -166,13 +166,13 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() override + virtual OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return static_getSupportedServiceNames(); } @@ -193,8 +193,8 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -rtl::OUString Dispatch::static_getImplementationName() { - return rtl::OUString( +OUString Dispatch::static_getImplementationName() { + return OUString( "com.sun.star.comp.test.deployment.passive_native_singleton"); } diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 37255f8ed27b..b1164869f91b 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -965,10 +965,10 @@ void DocumentHolder::setTitle(const OUString& aDocumentName) // set the title static const sal_Unicode u[] = { ' ','(',0 }; static const sal_Unicode c[] = { ')',0 }; - rtl::OUString aTotalName(m_aFilterName); - aTotalName += rtl::OUString(u); + OUString aTotalName(m_aFilterName); + aTotalName += OUString(u); aTotalName += aDocumentName; - aTotalName += rtl::OUString(c); + aTotalName += OUString(c); try { m_xFrame->setTitle( aTotalName ); } diff --git a/extensions/source/bibliography/bibprop.hxx b/extensions/source/bibliography/bibprop.hxx index 21261dc5ad76..2df398419f78 100644 --- a/extensions/source/bibliography/bibprop.hxx +++ b/extensions/source/bibliography/bibprop.hxx @@ -19,16 +19,16 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX -extern rtl::OUString FM_PROP_LABEL; -extern rtl::OUString FM_PROP_NAME; -extern rtl::OUString FM_PROP_CONTROLSOURCE; -extern rtl::OUString FM_PROP_FORMATKEY; -extern rtl::OUString FM_PROP_VALUE; -extern rtl::OUString FM_PROP_EDITMODE; -extern rtl::OUString FM_PROP_DATASOURCE; -extern rtl::OUString FM_PROP_CURSORSOURCE; -extern rtl::OUString FM_PROP_CURSORSOURCETYPE; -extern rtl::OUString FM_PROP_TEXT; +extern OUString FM_PROP_LABEL; +extern OUString FM_PROP_NAME; +extern OUString FM_PROP_CONTROLSOURCE; +extern OUString FM_PROP_FORMATKEY; +extern OUString FM_PROP_VALUE; +extern OUString FM_PROP_EDITMODE; +extern OUString FM_PROP_DATASOURCE; +extern OUString FM_PROP_CURSORSOURCE; +extern OUString FM_PROP_CURSORSOURCETYPE; +extern OUString FM_PROP_TEXT; #endif diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 00533977a45e..fe4e5b315446 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -99,27 +99,27 @@ namespace logging static_cast<int>(aDateTime.Year), static_cast<int>(aDateTime.Month), static_cast<int>(aDateTime.Day) ); - rtl::OUString sDate = rtl::OUString::createFromAscii( buffer ); + OUString sDate = OUString::createFromAscii( buffer ); snprintf( buffer, buffer_size, "%02i-%02i-%02i.%03i", static_cast<int>(aDateTime.Hours), static_cast<int>(aDateTime.Minutes), static_cast<int>(aDateTime.Seconds), ::sal::static_int_cast< sal_Int16 >( aDateTime.NanoSeconds / 10000000 ) ); - rtl::OUString sTime = rtl::OUString::createFromAscii( buffer ); + OUString sTime = OUString::createFromAscii( buffer ); - rtl::OUStringBuffer aBuff; + OUStringBuffer aBuff; aBuff.append( sDate ); aBuff.append( '.' ); aBuff.append( sTime ); - rtl::OUString sDateTime = aBuff.makeStringAndClear(); + OUString sDateTime = aBuff.makeStringAndClear(); oslProcessIdentifier aProcessId = 0; oslProcessInfo info; info.Size = sizeof (oslProcessInfo); if ( osl_getProcessInfo ( nullptr, osl_Process_IDENTIFIER, &info ) == osl_Process_E_None) aProcessId = info.Ident; - rtl::OUString aPID = OUString::number( aProcessId ); + OUString aPID = OUString::number( aProcessId ); Variable const aVariables[] = { diff --git a/filter/qa/cppunit/priority-test.cxx b/filter/qa/cppunit/priority-test.cxx index cc2bf2b28ead..88b232684ecf 100644 --- a/filter/qa/cppunit/priority-test.cxx +++ b/filter/qa/cppunit/priority-test.cxx @@ -69,7 +69,7 @@ void PriorityFilterTest::testPriority() aMsg.append("' should be '"); aMsg.append(aFormatCorrect); aMsg.append("'"); - CPPUNIT_ASSERT_EQUAL_MESSAGE(rtl::OUStringToOString(aMsg.makeStringAndClear(), + CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr(), aFormatCorrect, aTypeName); } @@ -79,7 +79,7 @@ void PriorityFilterTest::testPriority() aMsg.append("'"); aMsg.append(e.Message); aMsg.append("'"); - CPPUNIT_FAIL(rtl::OUStringToOString(aMsg.makeStringAndClear(), + CPPUNIT_FAIL(OUStringToOString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); } } diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index f684b4048667..276287eb7e90 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -117,11 +117,11 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine // Overrides to resolve ambiguity - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override { return BaseContainer::getByName(aName); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { return BaseContainer::hasByName(aName); } virtual css::uno::Type SAL_CALL getElementType() override @@ -129,7 +129,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine virtual sal_Bool SAL_CALL hasElements() override { return BaseContainer::hasElements(); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const OUString& Query ) override { return BaseContainer::createSubSetEnumerationByQuery(Query); } virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override { return BaseContainer::createSubSetEnumerationByProperties(Properties); } diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 7dab5e02b0d9..9d803a63890c 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -116,11 +116,11 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override { return BaseContainer::getByName(aName); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { return BaseContainer::hasByName(aName); } virtual css::uno::Type SAL_CALL getElementType() override @@ -128,7 +128,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer virtual sal_Bool SAL_CALL hasElements() override { return BaseContainer::hasElements(); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const OUString& Query ) override { return BaseContainer::createSubSetEnumerationByQuery(Query); } virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override { return BaseContainer::createSubSetEnumerationByProperties(Properties); } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 953d4c423f9c..03e69c96c716 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -467,7 +467,7 @@ void EscherPropertyContainer::CreateGradientProperties( pGradient = o3tl::doAccess<awt::Gradient>(aAny); uno::Any aAnyTemp; - const rtl::OUString aPropName( "FillStyle" ); + const OUString aPropName( "FillStyle" ); if ( EscherPropertyValueHelper::GetPropertyValue( aAnyTemp, rXPropSet, aPropName ) ) { diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index ac9550d7c6ca..bce3e2612b18 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2303,7 +2303,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void ) void SVGExport::writeMtf( const GDIMetaFile& rMtf ) { const Size aSize( OutputDevice::LogicToLogic(rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MapMode(MapUnit::MapMM)) ); - rtl::OUString aAttr; + OUString aAttr; Reference< XExtendedDocumentHandler> xExtDocHandler( GetDocHandler(), UNO_QUERY ); if( xExtDocHandler.is() && IsUseDTDString() ) diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index 0e06c27a17da..994eda6469f6 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -85,17 +85,17 @@ public: { return OInterfaceContainer::getElementType(); } virtual sal_Bool SAL_CALL hasElements() override { return OInterfaceContainer::hasElements(); } - virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1) override + virtual css::uno::Any SAL_CALL getByName(const OUString& p1) override { return OInterfaceContainer::getByName(p1); } - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() override + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override { return OInterfaceContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) override + virtual sal_Bool SAL_CALL hasByName(const OUString& p1) override { return OInterfaceContainer::hasByName(p1); } - virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2) override + virtual void SAL_CALL replaceByName(const OUString& p1, const css::uno::Any& p2) override { OInterfaceContainer::replaceByName(p1, p2); } - virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2) override + virtual void SAL_CALL insertByName(const OUString& p1, const css::uno::Any& p2) override { OInterfaceContainer::insertByName(p1, p2); } - virtual void SAL_CALL removeByName(const rtl::OUString& p1) override + virtual void SAL_CALL removeByName(const OUString& p1) override { OInterfaceContainer::removeByName(p1); } virtual sal_Int32 SAL_CALL getCount() override { return OInterfaceContainer::getCount(); } @@ -113,7 +113,7 @@ public: { OInterfaceContainer::registerScriptEvent(p1, p2); } virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2) override { OInterfaceContainer::registerScriptEvents(p1, p2); } - virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4) override + virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const OUString& p2, const OUString& p3, const OUString& p4) override { OInterfaceContainer::revokeScriptEvent(p1, p2, p3, p4); } virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1) override { OInterfaceContainer::revokeScriptEvents(p1); } diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 97945b54fe14..430d574833f1 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -101,21 +101,21 @@ namespace frm #define PROPERTY_ID_BORDER (PROPERTY_ID_START + 62) // UINT16 #define PROPERTY_ID_ALIGN (PROPERTY_ID_START + 63) // UINT16 #define PROPERTY_ID_DROPDOWN (PROPERTY_ID_START + 64) // BOOL -#define PROPERTY_ID_UNCHECKED_REFVALUE (PROPERTY_ID_START + 65) // ::rtl::OUString +#define PROPERTY_ID_UNCHECKED_REFVALUE (PROPERTY_ID_START + 65) // OUString #define PROPERTY_ID_HSCROLL (PROPERTY_ID_START + 66) // BOOL #define PROPERTY_ID_VSCROLL (PROPERTY_ID_START + 67) // BOOL #define PROPERTY_ID_TABSTOP (PROPERTY_ID_START + 68) // BOOL -#define PROPERTY_ID_REFVALUE (PROPERTY_ID_START + 69) // ::rtl::OUString +#define PROPERTY_ID_REFVALUE (PROPERTY_ID_START + 69) // OUString #define PROPERTY_ID_BUTTONTYPE (PROPERTY_ID_START + 70) // UINT16 -#define PROPERTY_ID_DEFAULT_TEXT (PROPERTY_ID_START + 71) // ::rtl::OUString +#define PROPERTY_ID_DEFAULT_TEXT (PROPERTY_ID_START + 71) // OUString #define PROPERTY_ID_SUBMIT_ACTION (PROPERTY_ID_START + 72) // string #define PROPERTY_ID_SUBMIT_METHOD (PROPERTY_ID_START + 73) // FmSubmitMethod #define PROPERTY_ID_SUBMIT_ENCODING (PROPERTY_ID_START + 74) // FmSubmitEncoding -#define PROPERTY_ID_DEFAULT_VALUE (PROPERTY_ID_START + 75) // ::rtl::OUString -#define PROPERTY_ID_SUBMIT_TARGET (PROPERTY_ID_START + 76) // ::rtl::OUString +#define PROPERTY_ID_DEFAULT_VALUE (PROPERTY_ID_START + 75) // OUString +#define PROPERTY_ID_SUBMIT_TARGET (PROPERTY_ID_START + 76) // OUString #define PROPERTY_ID_DEFAULT_STATE (PROPERTY_ID_START + 77) // UINT16 #define PROPERTY_ID_VALUE_SEQ (PROPERTY_ID_START + 78) // StringSeq -#define PROPERTY_ID_IMAGE_URL (PROPERTY_ID_START + 79) // ::rtl::OUString +#define PROPERTY_ID_IMAGE_URL (PROPERTY_ID_START + 79) // OUString #define PROPERTY_ID_SELECT_VALUE (PROPERTY_ID_START + 80) // StringSeq #define PROPERTY_ID_SELECT_VALUE_SEQ (PROPERTY_ID_START + 81) // StringSeq // free @@ -142,9 +142,9 @@ namespace frm #define PROPERTY_ID_VALUEMIN (PROPERTY_ID_START +103) // INT32 #define PROPERTY_ID_VALUEMAX (PROPERTY_ID_START +104) // INT32 #define PROPERTY_ID_VALUESTEP (PROPERTY_ID_START +105) // INT32 -#define PROPERTY_ID_CURRENCYSYMBOL (PROPERTY_ID_START +106) // ::rtl::OUString -#define PROPERTY_ID_EDITMASK (PROPERTY_ID_START +107) // ::rtl::OUString -#define PROPERTY_ID_LITERALMASK (PROPERTY_ID_START +108) // ::rtl::OUString +#define PROPERTY_ID_CURRENCYSYMBOL (PROPERTY_ID_START +106) // OUString +#define PROPERTY_ID_EDITMASK (PROPERTY_ID_START +107) // OUString +#define PROPERTY_ID_LITERALMASK (PROPERTY_ID_START +108) // OUString #define PROPERTY_ID_ENABLED (PROPERTY_ID_START +109) // BOOL #define PROPERTY_ID_AUTOCOMPLETE (PROPERTY_ID_START +110) // BOOL #define PROPERTY_ID_LINECOUNT (PROPERTY_ID_START +111) // UINT16 @@ -154,9 +154,9 @@ namespace frm #define PROPERTY_ID_SHOWTHOUSANDSEP (PROPERTY_ID_START +115) // BOOL #define PROPERTY_ID_HARDLINEBREAKS (PROPERTY_ID_START +116) // BOOL #define PROPERTY_ID_PRINTABLE (PROPERTY_ID_START +117) // BOOL -#define PROPERTY_ID_TARGET_URL (PROPERTY_ID_START +118) // ::rtl::OUString -#define PROPERTY_ID_TARGET_FRAME (PROPERTY_ID_START +119) // ::rtl::OUString -#define PROPERTY_ID_TAG (PROPERTY_ID_START +120) // ::rtl::OUString +#define PROPERTY_ID_TARGET_URL (PROPERTY_ID_START +118) // OUString +#define PROPERTY_ID_TARGET_FRAME (PROPERTY_ID_START +119) // OUString +#define PROPERTY_ID_TAG (PROPERTY_ID_START +120) // OUString #define PROPERTY_ID_ECHO_CHAR (PROPERTY_ID_START +121) // UINT16 #define PROPERTY_ID_SHOW_POSITION (PROPERTY_ID_START +122) // sal_Bool #define PROPERTY_ID_SHOW_NAVIGATION (PROPERTY_ID_START +123) // sal_Bool @@ -167,13 +167,13 @@ namespace frm #define PROPERTY_ID_DATE_SHOW_CENTURY (PROPERTY_ID_START +128) // Bool #define PROPERTY_ID_TRISTATE (PROPERTY_ID_START +129) // Bool #define PROPERTY_ID_DEFAULT_BUTTON (PROPERTY_ID_START +130) // Bool -#define PROPERTY_ID_HIDDEN_VALUE (PROPERTY_ID_START +131) // ::rtl::OUString +#define PROPERTY_ID_HIDDEN_VALUE (PROPERTY_ID_START +131) // OUString #define PROPERTY_ID_DECIMALS (PROPERTY_ID_START +132) // UINT16 #define PROPERTY_ID_AUTOINCREMENT (PROPERTY_ID_START +133) // UINT16 // free -#define PROPERTY_ID_FILTER (PROPERTY_ID_START +135) // ::rtl::OUString -#define PROPERTY_ID_HAVINGCLAUSE (PROPERTY_ID_START +136) // ::rtl::OUString -#define PROPERTY_ID_QUERY (PROPERTY_ID_START +137) // ::rtl::OUString +#define PROPERTY_ID_FILTER (PROPERTY_ID_START +135) // OUString +#define PROPERTY_ID_HAVINGCLAUSE (PROPERTY_ID_START +136) // OUString +#define PROPERTY_ID_QUERY (PROPERTY_ID_START +137) // OUString #define PROPERTY_ID_DEFAULT_LONG_VALUE (PROPERTY_ID_START +138) // Double #define PROPERTY_ID_DEFAULT_DATE (PROPERTY_ID_START +139) // UINT32 #define PROPERTY_ID_DEFAULT_TIME (PROPERTY_ID_START +140) @@ -188,7 +188,7 @@ namespace frm #define PROPERTY_ID_FONT_UNDERLINE (PROPERTY_ID_START +149) #define PROPERTY_ID_FONT_STRIKEOUT (PROPERTY_ID_START +150) #define PROPERTY_ID_ISPASSTHROUGH (PROPERTY_ID_START +151) -#define PROPERTY_ID_HELPURL (PROPERTY_ID_START +152) // ::rtl::OUString +#define PROPERTY_ID_HELPURL (PROPERTY_ID_START +152) // OUString #define PROPERTY_ID_RECORDMARKER (PROPERTY_ID_START +153) #define PROPERTY_ID_BOUNDFIELD (PROPERTY_ID_START +154) #define PROPERTY_ID_FORMATSSUPPLIER (PROPERTY_ID_START +155) // XNumberFormatsSupplier @@ -215,7 +215,7 @@ namespace frm #define PROPERTY_ID_ISMODIFIED (PROPERTY_ID_START +177) // BOOL #define PROPERTY_ID_ISNEW (PROPERTY_ID_START +178) // BOOL #define PROPERTY_ID_PRIVILEGES (PROPERTY_ID_START +179) // INT32 -#define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< ::rtl::OUString > +#define PROPERTY_ID_DETAILFIELDS (PROPERTY_ID_START +180) // Sequence< OUString > #define PROPERTY_ID_COMMAND (PROPERTY_ID_START +181) // String #define PROPERTY_ID_COMMANDTYPE (PROPERTY_ID_START +182) // INT32 (css::sdb::CommandType) #define PROPERTY_ID_RESULTSET_CONCURRENCY (PROPERTY_ID_START +183)// INT32 (css::sdbc::ResultSetConcurrency) diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm index 2458116a4288..b56f5d38242c 100644 --- a/fpicker/source/aqua/CFStringUtilities.mm +++ b/fpicker/source/aqua/CFStringUtilities.mm @@ -20,10 +20,10 @@ #include <sal/log.hxx> #include "CFStringUtilities.hxx" -rtl::OUString CFStringToOUString(const CFStringRef sOrig) +OUString CFStringToOUString(const CFStringRef sOrig) { if (nullptr == sOrig) { - return rtl::OUString(); + return OUString(); } CFRetain(sOrig); @@ -38,23 +38,23 @@ rtl::OUString CFStringToOUString(const CFStringRef sOrig) //we no longer need the original string CFRelease(sOrig); - return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars)); + return OUString(reinterpret_cast<sal_Unicode *>(unichars)); } -CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString) +CFStringRef CFStringCreateWithOUString(const OUString& aString) { CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, reinterpret_cast<UniChar const *>(aString.getStr()), aString.getLength()); return ref; } -rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info) +OUString FSRefToOUString(FSRef const & fsRef, InfoType info) { SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef CFURLRef aUrlRef = CFURLCreateFromFSRef(nullptr, &fsRef); SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info); + OUString sResult = CFURLRefToOUString(aUrlRef, info); //we no longer need the CFURLRef CFRelease(aUrlRef); @@ -62,7 +62,7 @@ rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info) return sResult; } -rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info) +OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info) { CFStringRef sURLString = nullptr; @@ -97,7 +97,7 @@ rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info) break; } - rtl::OUString sResult = CFStringToOUString(sURLString); + OUString sResult = CFStringToOUString(sURLString); CFRelease(sURLString); diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm index 1b10248630b2..cd67c04b037f 100644 --- a/fpicker/source/aqua/ControlHelper.mm +++ b/fpicker/source/aqua/ControlHelper.mm @@ -270,7 +270,7 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId ) return OUString(); } - rtl::OUString retVal; + OUString retVal; if ([pControl class] == [NSPopUpButton class]) { NSString *temp = m_aMapListLabels[pControl]; if (temp != nil) diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index 3e748021079f..5db89a745f6f 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -32,10 +32,10 @@ namespace { -void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixString) { +void fillSuffixList(OUStringList& aSuffixList, const OUString& suffixString) { sal_Int32 nIndex = 0; do { - rtl::OUString aToken = suffixString.getToken( 0, ';', nIndex ); + OUString aToken = suffixString.getToken( 0, ';', nIndex ); aSuffixList.push_back(aToken.copy(1)); } while ( nIndex >= 0 ); } @@ -46,7 +46,7 @@ void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixStri #pragma mark FilterEntry -FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters ) +FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { @@ -71,13 +71,13 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) #pragma mark statics static bool -isFilterString( const rtl::OUString& rFilterString, const char *pMatch ) +isFilterString( const OUString& rFilterString, const char *pMatch ) { sal_Int32 nIndex = 0; - rtl::OUString aToken; + OUString aToken; bool bIsFilter = true; - rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch)); + OUString aMatch(OUString::createFromAscii(pMatch)); do { @@ -95,11 +95,11 @@ isFilterString( const rtl::OUString& rFilterString, const char *pMatch ) -static rtl::OUString -shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false ) +static OUString +shrinkFilterName( const OUString& aFilterName, bool bAllowNoStar = false ) { sal_Int32 nBracketEnd = -1; - rtl::OUString aRealName(aFilterName); + OUString aRealName(aFilterName); for( sal_Int32 i = aRealName.getLength() - 1; i > 0; i-- ) { @@ -111,11 +111,11 @@ shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false ) if( nBracketEnd <= 0 ) continue; if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() ); else if (bAllowNoStar) { if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() ); } } } @@ -129,10 +129,10 @@ namespace { struct FilterTitleMatch { protected: - const rtl::OUString rTitle; + const OUString rTitle; public: - FilterTitleMatch( const rtl::OUString& _rTitle ) : rTitle( _rTitle ) { } + FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } bool operator () ( const FilterEntry& _rEntry ) @@ -140,12 +140,12 @@ public: bool bMatch; if( !_rEntry.hasSubFilters() ) { //first try the complete filter name - rtl::OUString title = _rEntry.getTitle(); + OUString title = _rEntry.getTitle(); bMatch = title.equals(rTitle); if (!bMatch) { //we didn't find a match using the full name, let's give it another //try using the shrunk version - rtl::OUString aShrunkName = shrinkFilterName( _rEntry.getTitle() ).trim(); + OUString aShrunkName = shrinkFilterName( _rEntry.getTitle() ).trim(); bMatch = aShrunkName.equals(rTitle); } } @@ -161,7 +161,7 @@ public: bool operator () ( const UnoFilterEntry& _rEntry ) { - rtl::OUString aShrunkName = shrinkFilterName( _rEntry.First ); + OUString aShrunkName = shrinkFilterName( _rEntry.First ); bool retVal = aShrunkName.equals(rTitle); return retVal; } @@ -194,7 +194,7 @@ FilterHelper::~FilterHelper() } -bool FilterHelper::FilterNameExists( const rtl::OUString& rTitle ) +bool FilterHelper::FilterNameExists( const OUString& rTitle ) { bool bRet = false; @@ -229,7 +229,7 @@ bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters ) } -void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ) +void FilterHelper::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( nullptr == m_pFilterList ) { @@ -240,7 +240,7 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt } } -void FilterHelper::SetCurFilter( const rtl::OUString& rFilter ) +void FilterHelper::SetCurFilter( const OUString& rFilter ) { SolarMutexGuard aGuard; @@ -260,7 +260,7 @@ void FilterHelper::SetFilters() } } -void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString) +void FilterHelper::appendFilter(const OUString& aTitle, const OUString& aFilterString) { SolarMutexGuard aGuard; @@ -277,19 +277,19 @@ void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUSt m_pFilterList->push_back(FilterEntry( aTitle, suffixList ) ); } -void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle ) +void FilterHelper::setCurrentFilter( const OUString& aTitle ) { SetCurFilter(aTitle); } -::rtl::OUString FilterHelper::getCurrentFilter( ) +OUString FilterHelper::getCurrentFilter( ) { - ::rtl::OUString sReturn = m_aCurrentFilter; + OUString sReturn = m_aCurrentFilter; return sReturn; } -void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters ) +void FilterHelper::appendFilterGroup( const OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters ) { SolarMutexGuard aGuard; @@ -297,7 +297,7 @@ void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, bool bPrependSeparator = m_pFilterList != nullptr; // ensure that we have a filter list - ::rtl::OUString sInitialCurrentFilter; + OUString sInitialCurrentFilter; if( aFilters.getLength() > 0) sInitialCurrentFilter = aFilters[0].First; ensureFilterList( sInitialCurrentFilter ); @@ -345,7 +345,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename) OUStringList suffixList = filter->getFilterSuffixList(); { - rtl::OUString aName = [sFilename OUString]; + OUString aName = [sFilename OUString]; for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); ++iter) { if (*iter == ".*" || aName.endsWithIgnoreAsciiCase(*iter)) { return true; @@ -401,7 +401,7 @@ int FilterHelper::getCurrentFilterIndex() if (m_aCurrentFilter.getLength() > 0) { int i = 0; for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter, ++i) { - rtl::OUString aTitle = iter->getTitle(); + OUString aTitle = iter->getTitle(); if (m_aCurrentFilter.equals(aTitle)) { result = i; break; @@ -423,7 +423,7 @@ OUStringList FilterHelper::getCurrentFilterSuffixList() OUStringList retVal; if (m_aCurrentFilter.getLength() > 0) { for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter) { - rtl::OUString aTitle = iter->getTitle(); + OUString aTitle = iter->getTitle(); if (m_aCurrentFilter.equals(aTitle)) { retVal = iter->getFilterSuffixList(); break; diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm index 99075d3c56fe..aaca75a18827 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.mm +++ b/fpicker/source/aqua/NSString_OOoAdditions.mm @@ -22,14 +22,14 @@ @implementation NSString (OOoAdditions) -+ (id) stringWithOUString:(const rtl::OUString&)ouString ++ (id) stringWithOUString:(const OUString&)ouString { NSString *string = [[NSString alloc] initWithCharacters:reinterpret_cast<unichar const *>(ouString.getStr()) length:ouString.getLength()]; return [string autorelease]; } -- (rtl::OUString) OUString +- (OUString) OUString { unsigned int nFileNameLength = [self length]; @@ -40,7 +40,7 @@ [self getCharacters:unichars]; - return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars)); + return OUString(reinterpret_cast<sal_Unicode *>(unichars)); } @end diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm index 7c4ddbade36a..8e5398da6d53 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.mm +++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm @@ -22,7 +22,7 @@ #include <sal/log.hxx> @implementation NSURL (OOoAdditions) -- (rtl::OUString) OUStringForInfo:(InfoType)info +- (OUString) OUStringForInfo:(InfoType)info { NSAutoreleasePool *pool = [NSAutoreleasePool new]; @@ -66,7 +66,7 @@ break; } - rtl::OUString sResult = [sURLString OUString]; + OUString sResult = [sURLString OUString]; [sURLString release]; [pool release]; diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index ec55964971ba..c46cd9cb8739 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -63,9 +63,9 @@ using namespace ::com::sun::star::uno; namespace { - uno::Sequence<rtl::OUString> FilePicker_getSupportedServiceNames() + uno::Sequence<OUString> FilePicker_getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aRet(3); + uno::Sequence<OUString> aRet(3); aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker"; aRet[2] = "com.sun.star.ui.dialogs.AquaFilePicker"; @@ -108,7 +108,7 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference< #pragma mark XAsynchronousExecutableDialog -void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle ) +void SAL_CALL SalAquaFilePicker::setTitle( const OUString& aTitle ) { SolarMutexGuard aGuard; implsetTitle(aTitle); @@ -140,7 +140,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() if (nullptr != frontWindow) { NSString *windowTitle = [frontWindow title]; if (windowTitle != nil) { - rtl::OUString ouName = [windowTitle OUString]; + OUString ouName = [windowTitle OUString]; //a window title will typically be something like "Untitled1 - OpenOffice.org Writer" //but we only want the "Untitled1" part of it sal_Int32 indexOfDash = ouName.indexOf(" - "); @@ -200,30 +200,30 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) } } -void SAL_CALL SalAquaFilePicker::setDefaultName( const rtl::OUString& aName ) +void SAL_CALL SalAquaFilePicker::setDefaultName( const OUString& aName ) { SolarMutexGuard aGuard; m_sSaveFileName = aName; } -void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory ) +void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const OUString& rDirectory ) { SolarMutexGuard aGuard; implsetDisplayDirectory(rDirectory); } -rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory() +OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory() { - rtl::OUString retVal = implgetDisplayDirectory(); + OUString retVal = implgetDisplayDirectory(); return retVal; } -uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() +uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getFiles() { - uno::Sequence< rtl::OUString > aSelectedFiles = getSelectedFiles(); + uno::Sequence< OUString > aSelectedFiles = getSelectedFiles(); // multiselection doesn't really work with getFiles // so just retrieve the first url if (aSelectedFiles.getLength() > 1) @@ -232,7 +232,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() return aSelectedFiles; } -uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() +uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() { SolarMutexGuard aGuard; @@ -258,7 +258,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() long nFiles = [files count]; SAL_INFO("fpicker.aqua", "# of items: " << nFiles); - uno::Sequence< rtl::OUString > aSelectedFiles(nFiles); + uno::Sequence< OUString > aSelectedFiles(nFiles); for(long nIndex = 0; nIndex < nFiles; nIndex += 1) { @@ -296,7 +296,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() #pragma mark XFilterManager -void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) +void SAL_CALL SalAquaFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) { SolarMutexGuard aGuard; @@ -305,7 +305,7 @@ void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, cons m_pControlHelper->setFilterControlNeeded(true); } -void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle ) +void SAL_CALL SalAquaFilePicker::setCurrentFilter( const OUString& aTitle ) { SolarMutexGuard aGuard; @@ -316,7 +316,7 @@ void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle ) updateSaveFileNameExtension(); } -rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() +OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() { SolarMutexGuard aGuard; @@ -327,7 +327,7 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() #pragma mark XFilterGroupManager -void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters ) +void SAL_CALL SalAquaFilePicker::appendFilterGroup( const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters ) { SolarMutexGuard aGuard; @@ -361,7 +361,7 @@ void SAL_CALL SalAquaFilePicker::enableControl( sal_Int16 nControlId, sal_Bool b m_pControlHelper->enableControl(nControlId, bEnable); } -void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel ) +void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const OUString& aLabel ) { SolarMutexGuard aGuard; @@ -369,7 +369,7 @@ void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OU m_pControlHelper->setLabel( nControlId, sLabel ) ; } -rtl::OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId ) +OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId ) { return m_pControlHelper->getLabel(nControlId); } @@ -476,17 +476,17 @@ void SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) #pragma mark XServiceInfo -rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName() +OUString SAL_CALL SalAquaFilePicker::getImplementationName() { return FILE_PICKER_IMPL_NAME; } -sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString& sServiceName ) +sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames() { return FilePicker_getSupportedServiceNames(); } @@ -557,7 +557,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension() if( aStringList.empty()) // #i9328# return; - rtl::OUString suffix = (*(aStringList.begin())).copy(1); + OUString suffix = (*(aStringList.begin())).copy(1); NSString *requiredFileType = [NSString stringWithOUString:suffix]; [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]]; diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index f9de585be0d3..b47d8138018d 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -51,9 +51,9 @@ using namespace ::com::sun::star::uno; namespace { // controlling event notifications - uno::Sequence<rtl::OUString> FolderPicker_getSupportedServiceNames() + uno::Sequence<OUString> FolderPicker_getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aRet(2); + uno::Sequence<OUString> aRet(2); aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker"; aRet[1] = "com.sun.star.ui.dialogs.AquaFolderPicker"; return aRet; @@ -68,7 +68,7 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi // XExecutableDialog -void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) +void SAL_CALL SalAquaFolderPicker::setTitle( const OUString& aTitle ) { SolarMutexGuard aGuard; @@ -103,14 +103,14 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() // XFolderPicker -void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory ) +void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const OUString& aDirectory ) { SolarMutexGuard aGuard; implsetDisplayDirectory(aDirectory); } -rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() +OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() { SolarMutexGuard aGuard; @@ -119,7 +119,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() return aDirectory; } -rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() +OUString SAL_CALL SalAquaFolderPicker::getDirectory() { SolarMutexGuard aGuard; @@ -135,7 +135,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw uno::RuntimeException("no directory selected", static_cast< cppu::OWeakObject * >( this )); } - rtl::OUString aDirectory; + OUString aDirectory; NSURL *url = [files objectAtIndex:0]; @@ -146,24 +146,24 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() return aDirectory; } -void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescription ) +void SAL_CALL SalAquaFolderPicker::setDescription( const OUString& rDescription ) { [m_pDialog setMessage:[NSString stringWithOUString:rDescription]]; } // XServiceInfo -rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName() +OUString SAL_CALL SalAquaFolderPicker::getImplementationName() { return FOLDER_PICKER_IMPL_NAME; } -sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& sServiceName ) +sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames() { return FolderPicker_getSupportedServiceNames(); } diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index 1753ad7d80e3..b6f40989e9cb 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -189,7 +189,7 @@ int SalAquaPicker::runandwaitforresult() return status; } -void SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory ) +void SalAquaPicker::implsetDisplayDirectory( const OUString& aDirectory ) { SolarMutexGuard aGuard; @@ -198,12 +198,12 @@ void SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory ) } } -rtl::OUString const & SalAquaPicker::implgetDisplayDirectory() +OUString const & SalAquaPicker::implgetDisplayDirectory() { return m_sDisplayDirectory; } -void SalAquaPicker::implsetTitle( const rtl::OUString& aTitle ) +void SalAquaPicker::implsetTitle( const OUString& aTitle ) { SolarMutexGuard aGuard; diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 1f07273da954..3ad1714aa2ed 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -33,7 +33,6 @@ #include <fpsofficeResMgr.hxx> #include "resourceprovider.hxx" -using rtl::OUString; using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx index 759bf5ef6cac..961f39b7bba0 100644 --- a/framework/inc/uielement/statusbaritem.hxx +++ b/framework/inc/uielement/statusbaritem.hxx @@ -40,26 +40,26 @@ public: explicit StatusbarItem( StatusBar *pStatusBar, sal_uInt16 nId, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~StatusbarItem() override; void SAL_CALL disposing() override; // css::ui::XStatusbarItem Attributes - virtual ::rtl::OUString SAL_CALL getCommand() override; + virtual OUString SAL_CALL getCommand() override; virtual ::sal_uInt16 SAL_CALL getItemId() override; virtual ::sal_uInt32 SAL_CALL getWidth() override; virtual ::sal_uInt16 SAL_CALL getStyle() override; virtual ::sal_Int32 SAL_CALL getOffset() override; virtual css::awt::Rectangle SAL_CALL getItemRect() override; - virtual ::rtl::OUString SAL_CALL getText() override; - virtual void SAL_CALL setText( const rtl::OUString& rText ) override; - virtual ::rtl::OUString SAL_CALL getHelpText() override; - virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) override; - virtual ::rtl::OUString SAL_CALL getQuickHelpText() override; - virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) override; - virtual ::rtl::OUString SAL_CALL getAccessibleName() override; - virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) override; + virtual OUString SAL_CALL getText() override; + virtual void SAL_CALL setText( const OUString& rText ) override; + virtual OUString SAL_CALL getHelpText() override; + virtual void SAL_CALL setHelpText( const OUString& rHelpText ) override; + virtual OUString SAL_CALL getQuickHelpText() override; + virtual void SAL_CALL setQuickHelpText( const OUString& rQuickHelpText ) override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual void SAL_CALL setAccessibleName( const OUString& rAccessibleName ) override; virtual sal_Bool SAL_CALL getVisible() override; virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; @@ -70,7 +70,7 @@ private: VclPtr<StatusBar> m_pStatusBar; sal_uInt16 m_nId; sal_uInt16 m_nStyle; - rtl::OUString m_aCommand; + OUString m_aCommand; }; diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index 0d676b86b35c..4f61ed7c3ff5 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -28,14 +28,14 @@ namespace framework struct AddonStatusbarItemData { - rtl::OUString aLabel; + OUString aLabel; }; struct AddonStatusbarItem { - rtl::OUString aCommandURL; - rtl::OUString aLabel; - rtl::OUString aContext; + OUString aCommandURL; + OUString aLabel; + OUString aContext; StatusBarItemBits nItemBits; sal_Int16 nWidth; }; @@ -44,25 +44,25 @@ typedef ::std::vector< AddonStatusbarItem > AddonStatusbarItemContainer; namespace StatusbarMerger { - bool IsCorrectContext( const ::rtl::OUString& aContext ); + bool IsCorrectContext( const OUString& aContext ); bool ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence, AddonStatusbarItemContainer& rContainer ); sal_uInt16 FindReferencePos( StatusBar* pStatusbar, - const ::rtl::OUString& rReferencePoint ); + const OUString& rReferencePoint ); bool ProcessMergeOperation( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, const AddonStatusbarItemContainer& rItems ); bool ProcessMergeFallback( StatusBar* pStatusbar, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, + const OUString& rMergeCommand, + const OUString& rMergeFallback, const AddonStatusbarItemContainer& rItems ); } diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 2fddbebe1aee..861b403ffb00 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -57,7 +57,7 @@ VclPtr<PopupMenu> AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& if ( rAddonMenuEntries.getLength() > 0 ) { pAddonMenu = VclPtr<PopupMenu>::Create(); - ::rtl::OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier( rFrame ); + OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier( rFrame ); AddonMenuManager::BuildMenu( pAddonMenu, MENU_APPEND, nUniqueMenuId, rAddonMenuEntries, rFrame, aModuleIdentifier ); // Don't return an empty Add-On menu @@ -119,7 +119,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, if ( nInsPos < nItemCount && pHelpMenu->GetItemType( nInsPos ) != MenuItemType::SEPARATOR ) nInsSepAfterPos = nInsPos; - ::rtl::OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier(rFrame); + OUString aModuleIdentifier = vcl::CommandInfoProvider::GetModuleIdentifier(rFrame); AddonMenuManager::BuildMenu( pHelpMenu, nInsPos, nUniqueMenuId, rAddonHelpMenuEntries, rFrame, aModuleIdentifier ); if ( pHelpMenu->GetItemCount() > nItemCount ) @@ -197,7 +197,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent sal_uInt16& nUniqueMenuId, const Sequence< Sequence< PropertyValue > >& aAddonMenuDefinition, const Reference< XFrame >& rFrame, - const ::rtl::OUString& rModuleIdentifier ) + const OUString& rModuleIdentifier ) { Sequence< Sequence< PropertyValue > > aAddonSubMenu; bool bInsertSeparator = false; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 7f2902cab545..10f0b06e67f9 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -274,7 +274,7 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesMenuItem( const OUString& aPropertyRootNode ) const; Sequence< OUString > GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const; Sequence< OUString > GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const; - Sequence< OUString > GetPropertyNamesStatusbarItem( const ::rtl::OUString& aPropertyRootNode ) const; + Sequence< OUString > GetPropertyNamesStatusbarItem( const OUString& aPropertyRootNode ) const; Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; @@ -926,29 +926,29 @@ bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstru void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer ) { - const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" ); + const OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" ); - Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName ); + Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName ); sal_uInt32 nCount = aAddonMergeNodesSeq.getLength(); - Sequence< ::rtl::OUString > aNodePropNames( 5 ); + Sequence< OUString > aNodePropNames( 5 ); for ( sal_uInt32 i = 0; i < nCount; i++ ) { - ::rtl::OUString aMergeAddonInstructions( aStatusbarMergeRootName + aAddonMergeNodesSeq[i] ); + OUString aMergeAddonInstructions( aStatusbarMergeRootName + aAddonMergeNodesSeq[i] ); - Sequence< ::rtl::OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions ); + Sequence< OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions ); sal_uInt32 nCountAddons = aAddonInstMergeNodesSeq.getLength(); for ( sal_uInt32 j = 0; j < nCountAddons; j++ ) { - ::rtl::OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions ); + OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions ); aMergeAddonInstructionBase.append( m_aPathDelimiter ); aMergeAddonInstructionBase.append( aAddonInstMergeNodesSeq[j] ); aMergeAddonInstructionBase.append( m_aPathDelimiter ); // Create sequence for data access - ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase ); + OUStringBuffer aBuffer( aMergeAddonInstructionBase ); aBuffer.append( m_aPropMergeMenuNames[ OFFSET_MERGESTATUSBAR_MERGEPOINT ] ); aNodePropNames[0] = aBuffer.makeStringAndClear(); @@ -986,17 +986,17 @@ void AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructi } bool AddonsOptions_Impl::ReadMergeStatusbarData( - const ::rtl::OUString& aMergeAddonInstructionBase, + const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeStatusbarItems ) { sal_uInt32 nStatusbarItemCount = rMergeStatusbarItems.getLength(); - ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase ); + OUStringBuffer aBuffer( aMergeAddonInstructionBase ); aBuffer.append( m_aPropMergeStatusbarNames[ OFFSET_MERGESTATUSBAR_STATUSBARITEMS ] ); - ::rtl::OUString aMergeStatusbarBaseNode = aBuffer.makeStringAndClear(); + OUString aMergeStatusbarBaseNode = aBuffer.makeStringAndClear(); - ::rtl::OUString aAddonStatusbarItemSetNode( aMergeStatusbarBaseNode + m_aPathDelimiter ); - Sequence< ::rtl::OUString > aAddonStatusbarItemSetNodeSeq = GetNodeNames( aMergeStatusbarBaseNode ); + OUString aAddonStatusbarItemSetNode( aMergeStatusbarBaseNode + m_aPathDelimiter ); + Sequence< OUString > aAddonStatusbarItemSetNodeSeq = GetNodeNames( aMergeStatusbarBaseNode ); Sequence< PropertyValue > aStatusbarItem( PROPERTYCOUNT_STATUSBARITEM ); aStatusbarItem[ OFFSET_STATUSBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; @@ -1011,7 +1011,7 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData( sal_uInt32 nCount = aAddonStatusbarItemSetNodeSeq.getLength(); for ( sal_uInt32 n = 0; n < nCount; n++ ) { - ::rtl::OUString aStatusbarItemNode( aAddonStatusbarItemSetNode + aAddonStatusbarItemSetNodeSeq[n] ); + OUString aStatusbarItemNode( aAddonStatusbarItemSetNode + aAddonStatusbarItemSetNodeSeq[n] ); if ( ReadStatusBarItem( aStatusbarItemNode, aStatusbarItem ) ) { @@ -1025,12 +1025,12 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData( } bool AddonsOptions_Impl::ReadStatusBarItem( - const ::rtl::OUString& aStatusarItemNodeName, + const OUString& aStatusarItemNodeName, Sequence< PropertyValue >& aStatusbarItem ) { bool bResult( false ); - ::rtl::OUString aURL; - ::rtl::OUString aAddonStatusbarItemTreeNode( aStatusarItemNodeName + m_aPathDelimiter ); + OUString aURL; + OUString aAddonStatusbarItemTreeNode( aStatusarItemNodeName + m_aPathDelimiter ); Sequence< Any > aStatusbarItemNodePropValues; aStatusbarItemNodePropValues = GetProperties( GetPropertyNamesStatusbarItem( aAddonStatusbarItemTreeNode ) ); @@ -1441,19 +1441,19 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUSt return lResult; } -Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem( - const ::rtl::OUString& aPropertyRootNode ) const +Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem( + const OUString& aPropertyRootNode ) const { - Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_STATUSBARITEM ); - - lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); - lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_ALIGN ] ); - lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_AUTOSIZE ] ); - lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_OWNERDRAW ] ); - lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_MANDATORY ] ); - lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); + Sequence< OUString > lResult( PROPERTYCOUNT_STATUSBARITEM ); + + lResult[0] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); + lResult[1] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[2] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[3] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_ALIGN ] ); + lResult[4] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_AUTOSIZE ] ); + lResult[5] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_OWNERDRAW ] ); + lResult[6] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_MANDATORY ] ); + lResult[7] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); return lResult; } diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 2ee8a298ed4e..66755c88ccc9 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -72,10 +72,10 @@ public: const cssu::Reference<cssu::XInterface>& rxEventFocus) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService ( - const ::rtl::OUString& rsServiceName) override; - virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() override; + const OUString& rsServiceName) override; + virtual cssu::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; // XEventListener virtual void SAL_CALL disposing ( @@ -86,8 +86,8 @@ public: { public: ListenerContainer maListeners; - ::rtl::OUString msCurrentApplicationName; - ::rtl::OUString msCurrentContextName; + OUString msCurrentApplicationName; + OUString msCurrentContextName; }; typedef ::std::map<cssu::Reference<cssu::XInterface>, FocusDescriptor> ListenerMap; ListenerMap maListeners; @@ -288,7 +288,7 @@ OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName() return OUString("org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer"); } -sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const ::rtl::OUString& rsServiceName) +sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const OUString& rsServiceName) { return cppu::supportsService(this, rsServiceName); } diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 669e84b880a4..15f01a02e543 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/awt/XGraphics2.hpp> #include <com/sun/star/graphic/GraphicType.hpp> -using ::rtl::OUString; - using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -89,7 +87,7 @@ void SAL_CALL GenericStatusbarController::statusChanged( m_bEnabled = rEvent.IsEnabled; - rtl::OUString aStrValue; + OUString aStrValue; Reference< graphic::XGraphic > aGraphic; if ( rEvent.State >>= aStrValue ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 93c458ec15e3..022f5d766c5d 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1303,7 +1303,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< std::unique_ptr<MenuItemHan const sal_uInt32 nCount = aMenuShortCuts.size(); for ( sal_uInt32 i = 0; i < nCount; ++i ) { - rtl::OUString aItemURL = aMenuShortCuts[i]->aMenuItemURL; + OUString aItemURL = aMenuShortCuts[i]->aMenuItemURL; if( aItemURL.isEmpty() && aMenuShortCuts[i]->xSubMenuManager.is()) aItemURL = "-"; // tdf#99527 prevent throw in case of empty commands aSeq[i] = aItemURL; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 157fc8e3b6cf..631c65603e3f 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -313,7 +313,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); URL aTargetURL; - aTargetURL.Complete = rtl::OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot); + aTargetURL.Complete = OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot); m_xURLTransformer->parseStrict( aTargetURL ); Reference< XDispatch > xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if(xMenuItemDispatch == nullptr) diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 959ea4fbec29..7ceb2a24434f 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/ui/ItemStyle.hpp> using namespace com::sun::star::ui; - -using rtl::OUString; using com::sun::star::uno::RuntimeException; namespace framework @@ -64,7 +62,7 @@ sal_uInt16 impl_convertItemBitsToItemStyle( StatusBarItemBits nItemBits ) StatusbarItem::StatusbarItem( StatusBar *pStatusBar, sal_uInt16 nId, - const rtl::OUString& aCommand ) + const OUString& aCommand ) : StatusbarItem_Base( m_aMutex ) , m_pStatusBar( pStatusBar ) , m_nId( nId ) diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index 455950458304..3fabfc6ea695 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -18,7 +18,6 @@ */ #include <uielement/statusbarmerger.hxx> -using rtl::OUString; using com::sun::star::beans::PropertyValue; using com::sun::star::uno::Sequence; @@ -138,7 +137,7 @@ bool lcl_ReplaceItem( StatusBar* pStatusbar, bool lcl_RemoveItems( StatusBar* pStatusbar, sal_uInt16 nPos, - const ::rtl::OUString& rMergeCommandParameter ) + const OUString& rMergeCommandParameter ) { sal_Int32 nCount = rMergeCommandParameter.toInt32(); if ( nCount > 0 ) @@ -180,7 +179,7 @@ sal_uInt16 StatusbarMerger::FindReferencePos( { for ( sal_uInt16 nPos = 0; nPos < pStatusbar->GetItemCount(); nPos++ ) { - const ::rtl::OUString rCmd = pStatusbar->GetItemCommand( pStatusbar->GetItemId( nPos ) ); + const OUString rCmd = pStatusbar->GetItemCommand( pStatusbar->GetItemId( nPos ) ); if ( rReferencePoint == rCmd ) return nPos; } @@ -192,8 +191,8 @@ bool StatusbarMerger::ProcessMergeOperation( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, const AddonStatusbarItemContainer& rItems ) { if ( rMergeCommand == MERGECOMMAND_ADDAFTER ) @@ -211,8 +210,8 @@ bool StatusbarMerger::ProcessMergeOperation( bool StatusbarMerger::ProcessMergeFallback( StatusBar* pStatusbar, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, + const OUString& rMergeCommand, + const OUString& rMergeFallback, const AddonStatusbarItemContainer& rItems ) { // fallback IGNORE or REPLACE/REMOVE item not found diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 8603ad0e3643..deaf29485c6c 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -60,7 +60,7 @@ public: virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) override; protected: - UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode ); + UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString &rUINode ); bool m_bConfigRead; css::uno::Reference< css::uno::XComponentContext > m_xContext; rtl::Reference<ConfigurationAccess_ControllerFactory> m_pConfigAccess; @@ -71,7 +71,7 @@ private: UIControllerFactory::UIControllerFactory( const Reference< XComponentContext >& xContext, - const rtl::OUString &rConfigurationNode ) + const OUString &rConfigurationNode ) : UIControllerFactory_BASE(m_aMutex) , m_bConfigRead( false ) , m_xContext( xContext ) diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 9cd8f4465894..74ceb348dc46 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -58,15 +58,10 @@ #define YYDEBUG 1 #define YYERROR_VERBOSE 1 -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OStringBuffer; - extern int yylex(void); static void yyerror(char const *); -static void checkIdentifier(::rtl::OString const * id) +static void checkIdentifier(OString const * id) { static short check = 0; if (check == 0) { @@ -80,7 +75,7 @@ static void checkIdentifier(::rtl::OString const * id) if ( (id->pData->buffer[0] >= 97 && id->pData->buffer[0] <= 122) || id->pData->buffer[0] == '_') { if (check == 1) { - ::rtl::OStringBuffer msg(25 + id->getLength()); + OStringBuffer msg(25 + id->getLength()); msg.append("mismatched identifier '"); msg.append(*id); msg.append("'"); @@ -103,8 +98,8 @@ static void reportDoubleMemberDeclarations( } static void addInheritedInterface( - AstInterface * ifc, rtl::OString const & name, bool optional, - rtl::OUString const & documentation) + AstInterface * ifc, OString const & name, bool optional, + OUString const & documentation) { AstDeclaration * decl = ifc->lookupByName(name); AstDeclaration const * resolved = resolveTypedefs(decl); @@ -141,7 +136,7 @@ static void addInheritedInterface( } static AstDeclaration const * createNamedType( - rtl::OString const * scopedName, DeclList const * typeArgs) + OString const * scopedName, DeclList const * typeArgs) { AstDeclaration * decl = idlc()->scopes()->topNonNull()->lookupByName( *scopedName); @@ -219,8 +214,8 @@ static bool includes(AstDeclaration const * type1, AstDeclaration const * type2) FeDeclarator* fdval; /* declarator value */ FeDeclList* dlval; /* declarator list value */ FeInheritanceHeader* ihval; /* inheritance header value */ - ::rtl::OString* sval; /* OString value */ - std::vector< rtl::OString > * svals; + OString* sval; /* OString value */ + std::vector< OString > * svals; sal_Char* strval; /* sal_Char* value */ bool bval; /* sal_Boolean* value */ sal_Int64 ival; /* sal_Int64 value */ @@ -631,8 +626,8 @@ interface_dcl : && ifc->getScopedName() != "com::sun::star::uno::XInterface") { addInheritedInterface( - ifc, rtl::OString("::com::sun::star::uno::XInterface"), false, - rtl::OUString()); + ifc, OString("::com::sun::star::uno::XInterface"), false, + OUString()); } ifc->setDefined(); idlc()->setParseState(PS_InterfaceBodySeen); @@ -887,8 +882,8 @@ opt_attribute_get_raises: attribute_get_raises: IDL_GET raises ';' { - $$.documentation = new rtl::OUString( - rtl::OStringToOUString( + $$.documentation = new OUString( + OStringToOUString( idlc()->getDocumentation(), RTL_TEXTENCODING_UTF8)); $$.exceptions = $2; } @@ -910,8 +905,8 @@ attribute_set_raises: } raises ';' { - $$.documentation = new rtl::OUString( - rtl::OStringToOUString( + $$.documentation = new OUString( + OStringToOUString( idlc()->getDocumentation(), RTL_TEXTENCODING_UTF8)); $$.exceptions = $3; } @@ -1194,7 +1189,7 @@ interface_inheritance_decl: } else { addInheritedInterface( ifc, *$4, $1, - rtl::OStringToOUString( + OStringToOUString( idlc()->getDocumentation(), RTL_TEXTENCODING_UTF8)); } delete $4; @@ -2176,7 +2171,7 @@ scoped_name : identifier { checkIdentifier($4); - *$1 += ::rtl::OString("::"); + *$1 += OString("::"); *$1 += *$4; delete $4; $$ = $1; @@ -2478,7 +2473,7 @@ opt_type_params: type_params: identifier { - $$ = new std::vector< rtl::OString >; + $$ = new std::vector< OString >; $$->push_back(*$1); delete $1; } diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index 180381c3ff38..a7c23f458b96 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -58,7 +58,7 @@ int yycolumn = 1; yycolumn += yyleng; sal_Int32 beginLine = 0; -::rtl::OString docu; +OString docu; static int asciiToInteger(char const * s, sal_Int64 * sval, sal_uInt64 * uval) { bool neg = false; @@ -202,12 +202,12 @@ static double asciiToFloat(const sal_Char *s) static void idlParsePragma(sal_Char* pPragma) { - ::rtl::OString pragma(pPragma); + OString pragma(pPragma); sal_Int32 index = pragma.indexOf("include"); sal_Char* begin = pPragma + index + 8; sal_Char* offset = begin; while (*offset != ',') offset++; - //::rtl::OString include = pragma.copy(index + 8, offset - begin); + //OString include = pragma.copy(index + 8, offset - begin); //unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin))); } @@ -239,9 +239,9 @@ static void parseLineAndFile(sal_Char* pBuf) for (; *r != '"'; r++) ; *r = 0; if (*h == '\0') - idlc()->setFileName(::rtl::OString("standard input")); + idlc()->setFileName(OString("standard input")); else - idlc()->setFileName(::rtl::OString(h)); + idlc()->setFileName(OString(h)); bIsInMain = idlc()->getFileName() == idlc()->getRealFileName(); idlc()->setInMainfile(bIsInMain); @@ -364,7 +364,7 @@ published return IDL_PUBLISHED; } {IDENTIFIER} { - yylval.sval = new ::rtl::OString(yytext); + yylval.sval = new OString(yytext); return IDL_IDENTIFIER; } @@ -383,26 +383,26 @@ published return IDL_PUBLISHED; "/*" { BEGIN( COMMENT ); - docu = ::rtl::OString(); + docu = OString(); beginLine = idlc()->getLineNumber(); } "/***" { BEGIN( COMMENT ); - docu = ::rtl::OString(); + docu = OString(); beginLine = idlc()->getLineNumber(); } <COMMENT>[^*]+ { - docu += ::rtl::OString(yytext); + docu += OString(yytext); } <COMMENT>"*"[^*/]+ { - docu += ::rtl::OString(yytext); + docu += OString(yytext); } <COMMENT>"**" { - docu += ::rtl::OString(yytext); + docu += OString(yytext); } <COMMENT>[*]+"/" { @@ -416,26 +416,26 @@ published return IDL_PUBLISHED; "/**" { BEGIN( DOCU ); - docu = ::rtl::OString(); + docu = OString(); beginLine = idlc()->getLineNumber(); } <DOCU>[^*\n]+ { - docu += ::rtl::OString(yytext); + docu += OString(yytext); } <DOCU>"\n"[ \t]*"*"{1} { idlc()->setLineNumber( idlc()->getLineNumber() + 1); - docu += ::rtl::OString("\n"); + docu += OString("\n"); } <DOCU>"\n" { idlc()->setLineNumber( idlc()->getLineNumber() + 1); - docu += ::rtl::OString(yytext); + docu += OString(yytext); } <DOCU>"*"[^*^/\n]* { - docu += ::rtl::OString(yytext); + docu += OString(yytext); } <DOCU>"\n"[ \t]*"*/" { @@ -474,7 +474,7 @@ published return IDL_PUBLISHED; "//"[^/]{1}.*"\n" { /* only a comment */ - ::rtl::OString docStr(yytext); + OString docStr(yytext); docStr = docStr.copy( 0, docStr.lastIndexOf('\n') ); docStr = docStr.copy( docStr.lastIndexOf('/')+1 ); docStr = docStr.trim(); @@ -482,7 +482,7 @@ published return IDL_PUBLISHED; } "///".*"\n" { - ::rtl::OString docStr(yytext); + OString docStr(yytext); docStr = docStr.copy( 0, docStr.lastIndexOf('\n') ); docStr = docStr.copy( docStr.lastIndexOf('/')+1 ); docStr = docStr.trim(); diff --git a/include/comphelper/DisableInteractionHelper.hxx b/include/comphelper/DisableInteractionHelper.hxx index 7d99112edeaa..da513b9b23eb 100644 --- a/include/comphelper/DisableInteractionHelper.hxx +++ b/include/comphelper/DisableInteractionHelper.hxx @@ -29,7 +29,7 @@ public: private: virtual ~NoEnableJavaInteractionContext() override {} - virtual css::uno::Any SAL_CALL getValueByName(rtl::OUString const& Name) override + virtual css::uno::Any SAL_CALL getValueByName(OUString const& Name) override { if (Name == "DontEnableJava") return css::uno::Any(true); diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx index 33042e917ec3..70dd77667826 100644 --- a/include/comphelper/backupfilehelper.hxx +++ b/include/comphelper/backupfilehelper.hxx @@ -184,7 +184,7 @@ namespace comphelper private: // internal helper methods - static const rtl::OUString getPackURL(); + static const OUString getPackURL(); static const std::vector< OUString >& getCustomizationDirNames(); static const std::vector< OUString >& getCustomizationFileNames(); diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index 240545848b30..b45d584c9c7a 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -219,11 +219,11 @@ public: @return the raw hash value as sal_Int8 sequence. */ static css::uno::Sequence<sal_Int8> GetOoxHashAsSequence( - const rtl::OUString& rPassword, - const rtl::OUString& rSaltValue, + const OUString& rPassword, + const OUString& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName); + const OUString& rAlgorithmName); /** Convenience function to calculate a salted hash with iterations as @@ -264,12 +264,12 @@ public: @return the base64 encoded string of the hash value, that can be compared against a stored base64 encoded hash value. */ - static rtl::OUString GetOoxHashAsBase64( - const rtl::OUString& rPassword, - const rtl::OUString& rSaltValue, + static OUString GetOoxHashAsBase64( + const OUString& rPassword, + const OUString& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName); + const OUString& rAlgorithmName); /** Convenience function to calculate a salted hash with iterations as @@ -309,11 +309,11 @@ public: @return the raw the hash value. */ static std::vector<unsigned char> GetOoxHashAsVector( - const rtl::OUString& rPassword, + const OUString& rPassword, const std::vector<unsigned char>& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName); + const OUString& rAlgorithmName); /** This helper function generates a random sequence of bytes of diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index 6a44d737c5dd..e95c00410249 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -82,19 +82,19 @@ namespace drawinglayer double getStrikeoutOffset() const; double getTextWidth( - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const; void getTextOutlines( basegfx::B2DPolyPolygonVector&, - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength, const ::std::vector< double >& rDXArray) const; basegfx::B2DRange getTextBoundRect( - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const; @@ -103,12 +103,12 @@ namespace drawinglayer void addTextRectActions( const tools::Rectangle& rRectangle, - const rtl::OUString& rText, + const OUString& rText, DrawTextFlags nStyle, GDIMetaFile& rGDIMetaFile) const; ::std::vector< double > getTextArray( - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const; }; diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index 1f3f8923e062..91f8dc109276 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -63,7 +63,7 @@ class FWE_DLLPUBLIC AddonMenuManager sal_uInt16& nUniqueMenuId, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aAddonMenuDefinition, const css::uno::Reference< css::frame::XFrame >& rFrame, - const ::rtl::OUString& rModuleIdentifier ); + const OUString& rModuleIdentifier ); // Retrieve the menu entry property values from a sequence static void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry, diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 001d248f7dc5..2da3a8c4f4a3 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -71,10 +71,10 @@ typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContaine struct FWE_DLLPUBLIC MergeStatusbarInstruction { - ::rtl::OUString aMergePoint; - ::rtl::OUString aMergeCommand; - ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeContext; + OUString aMergePoint; + OUString aMergeCommand; + OUString aMergeCommandParameter; + OUString aMergeContext; css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeStatusbarItems; }; diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx index 303e4800af79..bdc81e8d7261 100644 --- a/include/o3tl/string_view.hxx +++ b/include/o3tl/string_view.hxx @@ -28,7 +28,7 @@ #include <sal/types.h> // An approximation of C++17 <string_view>, including implicit conversion -// from rtl::OString and rtl::OUString. +// from OString and OUString. namespace o3tl { @@ -547,7 +547,7 @@ public: data_(s.data()), size_(s.size()) {} // For std::string_view, this will be provided by a (LIBO_INTERNAL_ONLY) - // non-explicit conversion operator from rtl::OString: + // non-explicit conversion operator from OString: template<typename T = charT> basic_string_view( OString const & s, typename std::enable_if< @@ -556,7 +556,7 @@ public: data_(s.getStr()), size_(s.getLength()) {} // For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY) - // non-explicit conversion operator from rtl::OUString: + // non-explicit conversion operator from OUString: template<typename T = charT> basic_string_view( OUString const & s, typename std::enable_if< @@ -566,10 +566,10 @@ public: // For std::u16string_view, this would either be provided by a // (LIBO_INTERNAL_ONLY) non-explicit conversion operator from - // rtl::OUStringLiteral, or rtl::OUStringLiteral would be given up in favor + // OUStringLiteral, or OUStringLiteral would be given up in favor // of std::u16string_view anyway (but this constructor also serves to reject // as ambiguous construction of a o3tl::u16string_view from a narrow string - // literal, which would otherwise go via the above rtl::OUString + // literal, which would otherwise go via the above OUString // constructor): template<typename T = charT> constexpr basic_string_view( OUStringLiteral literal, @@ -858,7 +858,7 @@ namespace o3tl { // LO-specific convenience functions: // For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY) -// rtl::OUString constructor: +// OUString constructor: inline OUString toOUString(u16string_view s) { return OUString(s.data(), s.size()); } diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx index b37b6659a443..8b99b8523d77 100644 --- a/include/oox/drawingml/clrscheme.hxx +++ b/include/oox/drawingml/clrscheme.hxx @@ -49,7 +49,7 @@ enum PredefinedClrSchemeId { Count }; -static std::map<PredefinedClrSchemeId, rtl::OUString> PredefinedClrNames = +static std::map<PredefinedClrSchemeId, OUString> PredefinedClrNames = { //{ dk1, "dk1" }, //{ lt1, "lt1" }, diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 3d67e49b23c3..b53988e2f908 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -598,8 +598,8 @@ public: sal_uInt32 mnTabStyle; sal_uInt32 mnTabData; sal_uInt32 mnVariousPropertyBits; - std::vector< ::rtl::OUString > maItems; // captions for each tab - std::vector< ::rtl::OUString > maTabNames; // names for each tab + std::vector< OUString > maItems; // captions for each tab + std::vector< OUString > maTabNames; // names for each tab }; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index f8fde406d06a..58199fc463f6 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -198,7 +198,7 @@ private: OUString maPrjName; ///< Name of the VBA project. css::uno::Reference< css::container::XNameContainer > mxOleOverridesSink; - typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap; + typedef RefMap< OUString, VbaModule > VbaModuleMap; VbaModuleMap maModules; VbaModuleMap maModulesByStrm; }; diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 55e7afedcb50..2bab907e884f 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -101,8 +101,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel OptValue< OUString > moGraphicTitle; ///< Title of the graphic. OptValue< OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated. OptValue< OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated. - OptValue< ::rtl::OUString > moWrapType; ///< How to wrap the text around the object - OptValue< ::rtl::OUString > moWrapSide; ///< On which side to wrap the text around the object + OptValue< OUString > moWrapType; ///< How to wrap the text around the object + OptValue< OUString > moWrapSide; ///< On which side to wrap the text around the object OUString maVTextAnchor; ///< How the text inside the shape is anchored vertically. OUString maWrapDistanceLeft; ///< Distance from the left side of the shape to the text that wraps around it. OUString maWrapDistanceRight; ///< Distance from the right side of the shape to the text that wraps around it. diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx index d25e719119ed..a41327f5e928 100644 --- a/include/registry/reader.hxx +++ b/include/registry/reader.hxx @@ -124,13 +124,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getDocumentation() const { + OUString getDocumentation() const { rtl_uString * s = nullptr; typereg_reader_getDocumentation(m_handle, &s); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -142,13 +142,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs @deprecated */ - rtl::OUString getFileName() const { + OUString getFileName() const { rtl_uString * s = nullptr; typereg_reader_getFileName(m_handle, &s); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -183,13 +183,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getTypeName() const { + OUString getTypeName() const { rtl_uString * s = nullptr; typereg_reader_getTypeName(m_handle, &s); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -212,13 +212,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getSuperTypeName(sal_uInt16 index) const { + OUString getSuperTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getSuperTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -240,13 +240,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getFieldDocumentation(sal_uInt16 index) const { + OUString getFieldDocumentation(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldDocumentation(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -259,13 +259,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs @deprecated */ - rtl::OUString getFieldFileName(sal_uInt16 index) const { + OUString getFieldFileName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldFileName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -288,13 +288,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getFieldName(sal_uInt16 index) const { + OUString getFieldName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -306,13 +306,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getFieldTypeName(sal_uInt16 index) const { + OUString getFieldTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -353,13 +353,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodDocumentation(sal_uInt16 index) const { + OUString getMethodDocumentation(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getMethodDocumentation(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -382,13 +382,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodName(sal_uInt16 index) const { + OUString getMethodName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getMethodName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -400,13 +400,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const { + OUString getMethodReturnTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getMethodReturnTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -451,7 +451,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodParameterName( + OUString getMethodParameterName( sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const { rtl_uString * s = nullptr; @@ -460,7 +460,7 @@ public: if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -476,7 +476,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodParameterTypeName( + OUString getMethodParameterTypeName( sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const { rtl_uString * s = nullptr; @@ -485,7 +485,7 @@ public: if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -512,7 +512,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodExceptionTypeName( + OUString getMethodExceptionTypeName( sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const { rtl_uString * s = nullptr; @@ -521,7 +521,7 @@ public: |