diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-08-02 08:44:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-08-02 08:55:53 +0100 |
| commit | d4b172b8196de05bb4efa39e19a2b324cf0b2778 (patch) | |
| tree | fa7c51dab729a66f3d71c11769ae8325a380bda4 /sfx2 | |
| parent | 1d90e4f5f3e046b946445dec38811fec8114364c (diff) | |
strip down UniString some more
Change-Id: Ibd749a70a7bbe8c1023edf7bd144aa6547147a12
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appdde.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 280dbf3cc614..94067d9ae111 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -66,7 +66,7 @@ public: ImplDdeService( const String& rNm ) : DdeService( rNm ) {} - virtual sal_Bool MakeTopic( const String& ); + virtual sal_Bool MakeTopic( const rtl::OUString& ); virtual String Topics(); @@ -110,7 +110,7 @@ namespace } } -sal_Bool ImplDdeService::MakeTopic( const String& rNm ) +sal_Bool ImplDdeService::MakeTopic( const rtl::OUString& rNm ) { // Workaround for Event after Main() under OS/2 // happens when exiting starts the App again @@ -223,7 +223,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); virtual sal_Bool StartAdviseLoop(); - virtual sal_Bool MakeItem( const String& rItem ); + virtual sal_Bool MakeItem( const rtl::OUString& rItem ); }; @@ -664,7 +664,7 @@ sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr ) return 0 != nRet; } -sal_Bool SfxDdeDocTopic_Impl::MakeItem( const String& rItem ) +sal_Bool SfxDdeDocTopic_Impl::MakeItem( const rtl::OUString& rItem ) { AddItem( DdeItem( rItem ) ); return sal_True; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index a2b7410f3516..755e6d6f50e2 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -603,7 +603,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) String sNm( rLinkName ); sal_uInt16 nTokenPos = 0; - String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + rtl::OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI) @@ -612,7 +612,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) if( pService->GetName() == sService ) { // then we search for the Topic - String sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + rtl::OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); if( pItemStt ) *pItemStt = nTokenPos; |