summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/linksrc.hxx10
-rw-r--r--sc/source/ui/docshell/servobj.cxx2
-rw-r--r--sc/source/ui/inc/servobj.hxx2
-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
-rw-r--r--sw/inc/swserv.hxx2
-rw-r--r--sw/source/core/doc/swserv.cxx2
10 files changed, 17 insertions, 15 deletions
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index 4ff77b6afa54..c19da26306f5 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -34,7 +34,9 @@ namespace com { namespace sun { namespace star { namespace uno
class Any;
}}}}
class Window;
-class String;
+namespace rtl {
+ class OUString;
+}
#ifndef ADVISEMODE_NODATA
// Must be the same value as Ole2 ADVF_*
@@ -69,14 +71,14 @@ public:
void SetUpdateTimeout( sal_uIntPtr nTime );
// notify the sink, the mime type is not
// a selection criterion
- void DataChanged( const String & rMimeType,
+ void DataChanged( const rtl::OUString & rMimeType,
const ::com::sun::star::uno::Any & rVal );
void SendDataChanged();
void NotifyDataChanged();
virtual sal_Bool Connect( SvBaseLink* );
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
- const String & rMimeType,
+ const rtl::OUString & rMimeType,
sal_Bool bSynchron = sal_False );
// sal_True => waitinmg for data
@@ -88,7 +90,7 @@ public:
virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl );
- void AddDataAdvise( SvBaseLink *, const String & rMimeType,
+ void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType,
sal_uInt16 nAdviceMode );
void RemoveAllDataAdvise( SvBaseLink * );
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index c5fbfe8dcbb5..1778a6e0478a 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -135,7 +135,7 @@ void ScServerObject::EndListeningAll()
sal_Bool ScServerObject::GetData(
::com::sun::star::uno::Any & rData /*out param*/,
- const String & rMimeType, sal_Bool /* bSynchron */ )
+ const OUString & rMimeType, sal_Bool /* bSynchron */ )
{
if (!pDocSh)
return false;
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index 674fdcb1b3c2..af22738271ba 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -55,7 +55,7 @@ public:
virtual ~ScServerObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
- const String & rMimeType,
+ const OUString & rMimeType,
sal_Bool bSynchron = false );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
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;
}
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index ad9ecb2435fc..a11110596a35 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -61,7 +61,7 @@ public:
virtual ~SwServerObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData,
- const String & rMimeType,
+ const OUString & rMimeType,
sal_Bool bSynchron = sal_False );
sal_Bool SetData( const String & rMimeType,
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index c472ac301913..529f23e14381 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -40,7 +40,7 @@ SwServerObject::~SwServerObject()
}
sal_Bool SwServerObject::GetData( uno::Any & rData,
- const String & rMimeType, sal_Bool )
+ const OUString & rMimeType, sal_Bool )
{
sal_Bool bRet = sal_False;
WriterRef xWrt;
generated by cgit (git 2.34.1) at 2025-01-17 23:06:15 +0000