summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-26 12:25:46 +0200
committerNoel Grandin <noel@peralex.com>2013-08-29 09:30:05 +0200
commitdf00d4c230d15951ad31405a3ea77e0faeebcb75 (patch)
treeba94eeced1948b943bcfbeb2fc614d4f396b335a /sfx2/source/appl
parent4779373d47341258cec36cc2178dff6ae11e5750 (diff)
convert include/sfx2/linksrc.hxx from String to OUString
Change-Id: I2ee2be4b87ef6f7fa9064ff742ccf4c854d7fea8
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/fileobj.cxx2
-rw-r--r--sfx2/source/appl/fileobj.hxx2
-rw-r--r--sfx2/source/appl/impldde.cxx2
-rw-r--r--sfx2/source/appl/impldde.hxx2
-rw-r--r--sfx2/source/appl/linksrc.cxx6
5 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 06f1cca1bf31..5cf77dbdf7e8 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -87,7 +87,7 @@ SvFileObject::~SvFileObject()
sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
- const String & rMimeType,
+ const OUString & rMimeType,
sal_Bool bGetSynchron )
{
sal_uIntPtr nFmt = SotExchange::GetFormatStringId( rMimeType );
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index c3e98e01a7d1..ac81e463b0cc 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -66,7 +66,7 @@ public:
SvFileObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
- const String & rMimeType,
+ const OUString & rMimeType,
sal_Bool bSynchron = sal_False );
virtual sal_Bool Connect( sfx2::SvBaseLink* );
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index dfa3948862ae..4d0774117937 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -130,7 +130,7 @@ SvDDEObject::~SvDDEObject()
}
sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
- const String & rMimeType,
+ const OUString & rMimeType,
sal_Bool bSynchron )
{
if( !pConnection )
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index a45c8b480ee0..c2e436a13dff 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -55,7 +55,7 @@ public:
SvDDEObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
- const String & aMimeType,
+ const OUString & aMimeType,
sal_Bool bSynchron = sal_False );
virtual sal_Bool Connect( SvBaseLink * );
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 1a0d8cb6f36e..9bc5c9c0d3f5 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -311,7 +311,7 @@ void SvLinkSource::NotifyDataChanged()
// notify the sink, the mime type is not
// a selection criterion
-void SvLinkSource::DataChanged( const String & rMimeType,
+void SvLinkSource::DataChanged( const OUString & rMimeType,
const ::com::sun::star::uno::Any & rVal )
{
if( pImpl->nTimeout && !rVal.hasValue() )
@@ -349,7 +349,7 @@ void SvLinkSource::DataChanged( const String & rMimeType,
// only one link is correct
-void SvLinkSource::AddDataAdvise( SvBaseLink * pLink, const String& rMimeType,
+void SvLinkSource::AddDataAdvise( SvBaseLink * pLink, const OUString& rMimeType,
sal_uInt16 nAdviseModes )
{
SvLinkSource_Entry_Impl* pNew = new SvLinkSource_Entry_Impl(
@@ -415,7 +415,7 @@ sal_Bool SvLinkSource::Connect( SvBaseLink* )
return sal_True;
}
-sal_Bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const String &, sal_Bool )
+sal_Bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &, sal_Bool )
{
return sal_False;
}