summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-23 17:23:52 +0200
committerNoel Grandin <noel@peralex.com>2013-08-29 09:30:05 +0200
commit4779373d47341258cec36cc2178dff6ae11e5750 (patch)
tree686d3b2c2b8ed2a33c75af7a1a89d7fd9c935b2d /sw/source
parent309559f1eef2bac804821f7a07737e3d338d566f (diff)
convert includes/sfx2/lnkbase.hxx from String to OUString
Change-Id: I3816ec77dd334823100421dab90d4bc8b67542e3
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/docnode/section.cxx4
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx2
-rw-r--r--sw/source/core/fields/ddefld.cxx4
-rw-r--r--sw/source/core/ole/ndole.cxx4
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx4
5 files changed, 9 insertions, 9 deletions
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