diff options
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/app/lnktrans.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/linkarea.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/lnktrans.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/linkarea.cxx | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index e1e19162b228..5733b14523c0 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -34,7 +34,7 @@ ScLinkTransferObj::~ScLinkTransferObj() { } -void ScLinkTransferObj::SetLinkURL( const String& rURL, const String& rText ) +void ScLinkTransferObj::SetLinkURL( const OUString& rURL, const OUString& rText ) { aLinkURL = rURL; aLinkText = rText; @@ -42,7 +42,7 @@ void ScLinkTransferObj::SetLinkURL( const String& rURL, const String& rText ) void ScLinkTransferObj::AddSupportedFormats() { - if ( aLinkURL.Len() ) + if ( !aLinkURL.isEmpty() ) { // TransferableHelper::SetINetBookmark formats @@ -58,7 +58,7 @@ void ScLinkTransferObj::AddSupportedFormats() sal_Bool ScLinkTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_Bool bOK = false; - if ( aLinkURL.Len() ) + if ( !aLinkURL.isEmpty() ) { INetBookmark aBmk( aLinkURL, aLinkText ); bOK = SetINetBookmark( aBmk, rFlavor ); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 5930daa60a7e..03b6ef0ae151 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -62,15 +62,15 @@ private: void UpdateSourceRanges(); void UpdateEnable(); - void LoadDocument( const OUString& rFile, const String& rFilter, - const String& rOptions ); + void LoadDocument( const OUString& rFile, const OUString& rFilter, + const OUString& rOptions ); public: ScLinkedAreaDlg( Window* pParent ); ~ScLinkedAreaDlg(); - void InitFromOldLink( const String& rFile, const String& rFilter, - const String& rOptions, const String& rSource, + void InitFromOldLink( const OUString& rFile, const OUString& rFilter, + const OUString& rOptions, const OUString& rSource, sal_uLong nRefresh ); virtual short Execute(); // overwritten to set dialog parent diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index be2d6d6119e5..705a24542221 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -26,14 +26,14 @@ class ScLinkTransferObj : public TransferableHelper { private: - String aLinkURL; - String aLinkText; + OUString aLinkURL; + OUString aLinkText; public: ScLinkTransferObj(); virtual ~ScLinkTransferObj(); - void SetLinkURL( const String& rURL, const String& rText ); + void SetLinkURL( const OUString& rURL, const OUString& rText ); virtual void AddSupportedFormats(); virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 284471cab820..bab7472e470f 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -127,7 +127,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) return 0; } -void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const String& rFilter, const String& rOptions ) +void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const OUString& rFilter, const OUString& rOptions ) { if ( pSourceShell ) { @@ -160,8 +160,8 @@ void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const String& rFilter } } -void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilter, - const String& rOptions, const String& rSource, +void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rFilter, + const OUString& rOptions, const OUString& rSource, sal_uLong nRefresh ) { LoadDocument( rFile, rFilter, rOptions ); @@ -178,7 +178,7 @@ void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilte xub_StrLen nRangeCount = comphelper::string::getTokenCount(rSource, ';'); for ( xub_StrLen i=0; i<nRangeCount; i++ ) { - String aRange = rSource.GetToken(i); + String aRange = rSource.getToken(i,';'); m_pLbRanges->SelectEntry( aRange ); } |