diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-26 15:22:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:06 +0200 |
| commit | bf1db6daca85bee8333740d43e087feb2965a81b (patch) | |
| tree | 3daed89ae5a5ad7c6bd3451f7bbbc556afb1c671 /svx | |
| parent | df00d4c230d15951ad31405a3ea77e0faeebcb75 (diff) | |
convert include/sfx2/linkmgr.hxx from String to OUString
along the way, de-virtual ScDocFunc::InsertAreaLink, since
it only has one implementation.
Change-Id: I3fc836f9954628f154e01b1c7ae8f90eb7600a76
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 22 |
2 files changed, 10 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index b49ce9d25584..e8ea0945d81b 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -900,9 +900,9 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL; if ( pLinkManager ) { - String aNewLinkURL; + OUString aNewLinkURL; pLinkManager->GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL, 0, 0 ); - if ( !aNewLinkURL.EqualsIgnoreCaseAscii( mpImpl->maLinkURL ) ) + if ( !aNewLinkURL.equalsIgnoreAsciiCase( mpImpl->maLinkURL ) ) { const_cast<SdrOle2Obj*>(this)->GetObjRef_Impl(); uno::Reference< embed::XCommonEmbedPersist > xPersObj( xObjRef.GetObject(), uno::UNO_QUERY ); diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index ec379dfc8537..1829b90de366 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -80,12 +80,12 @@ void ImpSdrObjTextLink::Closed() ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData(); if( pData ) { - String aFile; - String aFilter; + OUString aFile; + OUString aFilter; pLinkManager->GetDisplayNames( this, 0,&aFile, 0, &aFilter ); - if( !pData->aFileName.Equals( aFile ) || - !pData->aFilterName.Equals( aFilter )) + if( pData->aFileName != aFile || + pData->aFilterName != aFilter ) { pData->aFileName = aFile; pData->aFilterName = aFilter; @@ -267,17 +267,11 @@ void SdrTextObj::ImpLinkAnmeldung() ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL; if (pLinkManager!=NULL && pData!=NULL && pData->pLink==NULL) { // don't register twice - pData->pLink=new ImpSdrObjTextLink(this); -#ifdef __GNUC__ + pData->pLink = new ImpSdrObjTextLink(this); pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName, - pData->aFilterName.Len() ? - &pData->aFilterName : (const String *)NULL, - (const String *)NULL); -#else - pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName, - pData->aFilterName.Len() ? &pData->aFilterName : NULL,NULL); -#endif - pData->pLink->Connect(); + !pData->aFilterName.isEmpty() ? + &pData->aFilterName : NULL, + NULL); } } |