convert includes/sfx2/lnkbase.hxx from String to OUString

Change-Id: I3816ec77dd334823100421dab90d4bc8b67542e3

22 files changed, 45 insertions, 45 deletions

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 299d04cc612e..98d2560973d9 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -401,7 +401,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
     {
         sal_uInt16 nPos;
         SvBaseLink* pLink = GetSelEntry( &nPos );
-        if ( pLink && (pLink->GetLinkSourceName().Len() != 0) )
+        if ( pLink && !pLink->GetLinkSourceName().isEmpty() )
             pLink->Edit( this, LINK( this, SvBaseLinksDlg, EndEditHdl ) );
     }
     return 0;
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 88bec2d6ee98..5b8d1b1d8c2e 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -71,7 +71,7 @@ private:
     friend class SvLinkSource;
 
     SvLinkSourceRef         xObj;
-    String                  aLinkName;
+    OUString                aLinkName;
     BaseLink_Impl*          pImpl;
     sal_uInt16                  nObjType;
     sal_Bool                    bVisible : 1;
@@ -79,15 +79,15 @@ private:
     sal_Bool                    bUseCache : 1;  // for Graphics Links!
     sal_Bool                    bWasLastEditOK : 1;
 
-    DECL_LINK( EndEditHdl, String* );
+    DECL_LINK( EndEditHdl, OUString* );
 
-    bool                    ExecuteEdit( const String& _rNewName );
+    bool                    ExecuteEdit( const OUString& _rNewName );
 
 protected:
     void            SetObjType( sal_uInt16 );
 
     // Set LinkSourceName without action
-    void            SetName( const String & rLn );
+    void            SetName( const OUString & rLn );
 
     ImplBaseLinkData* pImplData;
 
@@ -112,7 +112,7 @@ public:
                     TYPEINFO();
 
     virtual void    Closed();
-                    SvBaseLink( const String& rNm, sal_uInt16 nObjectType,
+                    SvBaseLink( const OUString& rNm, sal_uInt16 nObjectType,
                                  SvLinkSource* );
 
     sal_uInt16          GetObjType() const { return nObjType; }
@@ -120,8 +120,8 @@ public:
     void            SetObj( SvLinkSource * pObj );
     SvLinkSource*   GetObj() const  { return xObj; }
 
-    void            SetLinkSourceName( const String & rName );
-    String          GetLinkSourceName() const;
+    void            SetLinkSourceName( const OUString & rName );
+    OUString        GetLinkSourceName() const;
 
     enum UpdateResult {
         SUCCESS = 0,
@@ -129,7 +129,7 @@ public:
     };
 
     virtual UpdateResult DataChanged(
-        const String & rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString & rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     void            SetUpdateMode( sal_uInt16 );
     sal_uInt16          GetUpdateMode() const;
@@ -165,7 +165,7 @@ public:
     void            clearStreamToLoadFrom();
 
     inline sal_Bool         WasLastEditOK() const       { return bWasLastEditOK; }
-    FileDialogHelper & GetInsertFileDialog(const String& rFactory) const;
+    FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const;
 };
 
 SV_DECL_IMPL_REF(SvBaseLink);
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 60670b478f94..23cba37e58b7 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -52,7 +52,7 @@ public:
 
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 4e39a5d027c9..20deaed7e074 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -58,7 +58,7 @@ public:
 
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue);
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue);
     virtual void Edit(Window* pParent, const Link& rEndEditHdl);
 
     void SetDoReferesh(bool b);
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 068d87f550bc..a0e17209af97 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -50,7 +50,7 @@ public:
     virtual ~ScTableLink();
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index f6ceba393b7f..be1c0f7377e0 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -60,7 +60,7 @@ public:
 
                     // overloaded by SvBaseLink:
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
                     // overloaded by SvtBroadcaster:
     virtual void    ListenersGone();
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 76e7616ffcef..c6a55d85b841 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -123,7 +123,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
 }
 
 sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged(
-    const String& rMimeType, const ::com::sun::star::uno::Any & rValue )
+    const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue )
 {
     //  wir koennen nur Strings...
     if ( FORMAT_STRING != SotExchange::GetFormatIdFromMimeType( rMimeType ))
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 6409fbd6415a..3f087c88fb73 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -103,7 +103,7 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
 }
 
 ::sfx2::SvBaseLink::UpdateResult ScAreaLink::DataChanged(
-    const String&, const ::com::sun::star::uno::Any& )
+    const OUString&, const ::com::sun::star::uno::Any& )
 {
     //  bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im
     //  LinkManager zu setzen, ohne die Daten im Dokument zu aendern
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index f27f25809cf8..3bcc6c465730 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1220,7 +1220,7 @@ void ScExternalRefLink::Closed()
     pMgr->breakLink(mnFileId);
 }
 
-::sfx2::SvBaseLink::UpdateResult ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rValue*/)
+::sfx2::SvBaseLink::UpdateResult ScExternalRefLink::DataChanged(const OUString& /*rMimeType*/, const Any& /*rValue*/)
 {
     if (!mbDoRefresh)
         return SUCCESS;
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 14ab87801c8c..7dd32ea647e4 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -123,7 +123,7 @@ void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
 }
 
 ::sfx2::SvBaseLink::UpdateResult ScTableLink::DataChanged(
-    const String&, const ::com::sun::star::uno::Any& )
+    const OUString&, const ::com::sun::star::uno::Any& )
 {
     sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
     if (pLinkManager!=NULL)
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 91ec17c18a7c..4a1b455ab62f 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -36,7 +36,7 @@ public:
 
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
     bool         Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
 
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index af17feb0e099..1f3612d5cd33 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -59,7 +59,7 @@ SdPageLink::~SdPageLink()
 \************************************************************************/
 
 ::sfx2::SvBaseLink::UpdateResult SdPageLink::DataChanged(
-    const String&, const ::com::sun::star::uno::Any& )
+    const OUString&, const ::com::sun::star::uno::Any& )
 {
     SdDrawDocument* pDoc = (SdDrawDocument*) pPage->GetModel();
     sfx2::LinkManager* pLinkManager = pDoc!=NULL ? pDoc->GetLinkManager() : NULL;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index e9d025c14f1f..3692a1654050 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -150,7 +150,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
 
 //--------------------------------------------------------------------------
 
-SvBaseLink::SvBaseLink( const String& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
+SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
     : pImpl(0)
 {
     bVisible = bSynchron = bUseCache = sal_True;
@@ -204,7 +204,7 @@ SvBaseLink::~SvBaseLink()
     delete pImpl;
 }
 
-IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
+IMPL_LINK( SvBaseLink, EndEditHdl, OUString*, _pNewName )
 {
     String sNewName;
     if ( _pNewName )
@@ -229,7 +229,7 @@ void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP )
 
 //--------------------------------------------------------------------------
 
-void SvBaseLink::SetName( const String & rNm )
+void SvBaseLink::SetName( const OUString & rNm )
 {
     aLinkName = rNm;
 }
@@ -247,7 +247,7 @@ void SvBaseLink::SetObj( SvLinkSource * pObj )
 
 //--------------------------------------------------------------------------
 
-void SvBaseLink::SetLinkSourceName( const String & rLnkNm )
+void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm )
 {
     if( aLinkName == rLnkNm )
         return;
@@ -265,7 +265,7 @@ void SvBaseLink::SetLinkSourceName( const String & rLnkNm )
 
 //--------------------------------------------------------------------------
 
-String  SvBaseLink::GetLinkSourceName() const
+OUString  SvBaseLink::GetLinkSourceName() const
 {
     return aLinkName;
 }
@@ -424,7 +424,7 @@ void SvBaseLink::Disconnect()
     }
 }
 
-SvBaseLink::UpdateResult SvBaseLink::DataChanged( const String &, const ::com::sun::star::uno::Any & )
+SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com::sun::star::uno::Any & )
 {
     switch( nObjType )
     {
@@ -474,9 +474,9 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
     }
 }
 
-bool SvBaseLink::ExecuteEdit( const String& _rNewName )
+bool SvBaseLink::ExecuteEdit( const OUString& _rNewName )
 {
-    if( _rNewName.Len() != 0 )
+    if( !_rNewName.isEmpty() )
     {
         SetLinkSourceName( _rNewName );
         if( !Update() )
@@ -519,7 +519,7 @@ void SvBaseLink::Closed()
         xObj->RemoveAllDataAdvise( this );
 }
 
-FileDialogHelper & SvBaseLink::GetInsertFileDialog(const String& rFactory) const
+FileDialogHelper & SvBaseLink::GetInsertFileDialog(const OUString& rFactory) const
 {
     if ( pImpl->m_pFileDlg )
         delete pImpl->m_pFileDlg;
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 65ef13a0278d..550ea103a99d 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -111,7 +111,7 @@ public:
     virtual void        Closed();
 
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
     void                DataChanged( const Graphic& rGraphic );
 
     bool                Connect() { return 0 != GetRealObject(); }
@@ -209,7 +209,7 @@ void SdrGraphicLink::RemoveGraphicUpdater()
 }
 
 ::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged(
-    const String& rMimeType, const ::com::sun::star::uno::Any & rValue )
+    const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue )
 {
     SdrModel*       pModel      = pGrafObj ? pGrafObj->GetModel() : 0;
     sfx2::LinkManager* pLinkManager= pModel  ? pModel->GetLinkManager() : 0;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index b97bf73733af..b49ce9d25584 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -603,7 +603,7 @@ public:
 
     virtual void        Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     bool                Connect() { return GetRealObject() != NULL; }
 };
@@ -626,7 +626,7 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink()
 // -----------------------------------------------------------------------------
 
 ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged(
-    const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ )
+    const OUString& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ )
 {
     if ( !pObj->UpdateLinkURL_Impl() )
     {
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index ebbd5f2a4f0b..ec379dfc8537 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -47,7 +47,7 @@ public:
 
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
@@ -70,7 +70,7 @@ void ImpSdrObjTextLink::Closed()
 
 
 ::sfx2::SvBaseLink::UpdateResult ImpSdrObjTextLink::DataChanged(
-    const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue */)
+    const OUString& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue */)
 {
     bool bForceReload = false;
     SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index fbd5fe161ec0..d5b6cc74d521 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -57,7 +57,7 @@ public:
     virtual ~SwBaseLink();
 
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     virtual void Closed();
 
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 6b4163f821a8..ecd2f94ba8cb 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -75,7 +75,7 @@ public:
 
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     virtual const SwNode* GetAnchor() const;
     virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, xub_StrLen nStt = 0,
@@ -1190,7 +1190,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 
 
 ::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged(
-    const String& rMimeType, const uno::Any & rValue )
+    const OUString& rMimeType, const uno::Any & rValue )
 {
     SwSectionNode* pSectNd = rSectFmt.GetSectionNode( sal_False );
     SwDoc* pDoc = rSectFmt.GetDoc();
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index ae8ed8a5cde5..a37fac73bff7 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -84,7 +84,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 
 
 ::sfx2::SvBaseLink::UpdateResult SwBaseLink::DataChanged(
-    const String& rMimeType, const uno::Any & rValue )
+    const OUString& rMimeType, const uno::Any & rValue )
 {
     if( !pCntntNode )
     {
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 6fd3c0824ccf..e3605514947d 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -45,14 +45,14 @@ public:
 
     virtual void Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     virtual const SwNode* GetAnchor() const;
     virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, xub_StrLen nStt = 0,
                             xub_StrLen nEnd = STRING_NOTFOUND ) const;
 };
 
-::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const String& rMimeType,
+::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const OUString& rMimeType,
                                 const uno::Any & rValue )
 {
     switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 93bd4dd2c8f3..9eff53940804 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -161,7 +161,7 @@ public:
 
     virtual void        Closed();
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     bool            Connect() { return GetRealObject() != NULL; }
 };
@@ -184,7 +184,7 @@ SwEmbedObjectLink::~SwEmbedObjectLink()
 // -----------------------------------------------------------------------------
 
 ::sfx2::SvBaseLink::UpdateResult SwEmbedObjectLink::DataChanged(
-    const String&, const uno::Any& )
+    const OUString&, const uno::Any& )
 {
     if ( !pOleNode->UpdateLinkURL_Impl() )
     {
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 45ba8b45c500..f459b9519cd3 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -164,7 +164,7 @@ public:
     SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh );
 
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
+        const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
     virtual void Closed();
 
     sal_Bool WriteData( SvStream& rStrm );
@@ -3588,7 +3588,7 @@ SwTrnsfrDdeLink::~SwTrnsfrDdeLink()
         Disconnect( sal_True );
 }
 
-::sfx2::SvBaseLink::UpdateResult SwTrnsfrDdeLink::DataChanged( const String& ,
+::sfx2::SvBaseLink::UpdateResult SwTrnsfrDdeLink::DataChanged( const OUString& ,
                                     const uno::Any& )
 {
     // well, that's it with the link