Kaydet (Commit) df00d4c2 authored tarafından Noel Grandin's avatar Noel Grandin

convert include/sfx2/linksrc.hxx from String to OUString

Change-Id: I2ee2be4b87ef6f7fa9064ff742ccf4c854d7fea8
üst 4779373d
...@@ -34,7 +34,9 @@ namespace com { namespace sun { namespace star { namespace uno ...@@ -34,7 +34,9 @@ namespace com { namespace sun { namespace star { namespace uno
class Any; class Any;
}}}} }}}}
class Window; class Window;
class String; namespace rtl {
class OUString;
}
#ifndef ADVISEMODE_NODATA #ifndef ADVISEMODE_NODATA
// Must be the same value as Ole2 ADVF_* // Must be the same value as Ole2 ADVF_*
...@@ -69,14 +71,14 @@ public: ...@@ -69,14 +71,14 @@ public:
void SetUpdateTimeout( sal_uIntPtr nTime ); void SetUpdateTimeout( sal_uIntPtr nTime );
// notify the sink, the mime type is not // notify the sink, the mime type is not
// a selection criterion // a selection criterion
void DataChanged( const String & rMimeType, void DataChanged( const rtl::OUString & rMimeType,
const ::com::sun::star::uno::Any & rVal ); const ::com::sun::star::uno::Any & rVal );
void SendDataChanged(); void SendDataChanged();
void NotifyDataChanged(); void NotifyDataChanged();
virtual sal_Bool Connect( SvBaseLink* ); virtual sal_Bool Connect( SvBaseLink* );
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, 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_Bool bSynchron = sal_False );
// sal_True => waitinmg for data // sal_True => waitinmg for data
...@@ -88,7 +90,7 @@ public: ...@@ -88,7 +90,7 @@ public:
virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl ); virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl );
void AddDataAdvise( SvBaseLink *, const String & rMimeType, void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType,
sal_uInt16 nAdviceMode ); sal_uInt16 nAdviceMode );
void RemoveAllDataAdvise( SvBaseLink * ); void RemoveAllDataAdvise( SvBaseLink * );
......
...@@ -135,7 +135,7 @@ void ScServerObject::EndListeningAll() ...@@ -135,7 +135,7 @@ void ScServerObject::EndListeningAll()
sal_Bool ScServerObject::GetData( sal_Bool ScServerObject::GetData(
::com::sun::star::uno::Any & rData /*out param*/, ::com::sun::star::uno::Any & rData /*out param*/,
const String & rMimeType, sal_Bool /* bSynchron */ ) const OUString & rMimeType, sal_Bool /* bSynchron */ )
{ {
if (!pDocSh) if (!pDocSh)
return false; return false;
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
virtual ~ScServerObject(); virtual ~ScServerObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
const String & rMimeType, const OUString & rMimeType,
sal_Bool bSynchron = false ); sal_Bool bSynchron = false );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
......
...@@ -87,7 +87,7 @@ SvFileObject::~SvFileObject() ...@@ -87,7 +87,7 @@ SvFileObject::~SvFileObject()
sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
const String & rMimeType, const OUString & rMimeType,
sal_Bool bGetSynchron ) sal_Bool bGetSynchron )
{ {
sal_uIntPtr nFmt = SotExchange::GetFormatStringId( rMimeType ); sal_uIntPtr nFmt = SotExchange::GetFormatStringId( rMimeType );
......
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
SvFileObject(); SvFileObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
const String & rMimeType, const OUString & rMimeType,
sal_Bool bSynchron = sal_False ); sal_Bool bSynchron = sal_False );
virtual sal_Bool Connect( sfx2::SvBaseLink* ); virtual sal_Bool Connect( sfx2::SvBaseLink* );
......
...@@ -130,7 +130,7 @@ SvDDEObject::~SvDDEObject() ...@@ -130,7 +130,7 @@ SvDDEObject::~SvDDEObject()
} }
sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/, sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
const String & rMimeType, const OUString & rMimeType,
sal_Bool bSynchron ) sal_Bool bSynchron )
{ {
if( !pConnection ) if( !pConnection )
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
SvDDEObject(); SvDDEObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
const String & aMimeType, const OUString & aMimeType,
sal_Bool bSynchron = sal_False ); sal_Bool bSynchron = sal_False );
virtual sal_Bool Connect( SvBaseLink * ); virtual sal_Bool Connect( SvBaseLink * );
......
...@@ -311,7 +311,7 @@ void SvLinkSource::NotifyDataChanged() ...@@ -311,7 +311,7 @@ void SvLinkSource::NotifyDataChanged()
// notify the sink, the mime type is not // notify the sink, the mime type is not
// a selection criterion // a selection criterion
void SvLinkSource::DataChanged( const String & rMimeType, void SvLinkSource::DataChanged( const OUString & rMimeType,
const ::com::sun::star::uno::Any & rVal ) const ::com::sun::star::uno::Any & rVal )
{ {
if( pImpl->nTimeout && !rVal.hasValue() ) if( pImpl->nTimeout && !rVal.hasValue() )
...@@ -349,7 +349,7 @@ void SvLinkSource::DataChanged( const String & rMimeType, ...@@ -349,7 +349,7 @@ void SvLinkSource::DataChanged( const String & rMimeType,
// only one link is correct // only one link is correct
void SvLinkSource::AddDataAdvise( SvBaseLink * pLink, const String& rMimeType, void SvLinkSource::AddDataAdvise( SvBaseLink * pLink, const OUString& rMimeType,
sal_uInt16 nAdviseModes ) sal_uInt16 nAdviseModes )
{ {
SvLinkSource_Entry_Impl* pNew = new SvLinkSource_Entry_Impl( SvLinkSource_Entry_Impl* pNew = new SvLinkSource_Entry_Impl(
...@@ -415,7 +415,7 @@ sal_Bool SvLinkSource::Connect( SvBaseLink* ) ...@@ -415,7 +415,7 @@ sal_Bool SvLinkSource::Connect( SvBaseLink* )
return sal_True; 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; return sal_False;
} }
......
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
virtual ~SwServerObject(); virtual ~SwServerObject();
virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData, virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData,
const String & rMimeType, const OUString & rMimeType,
sal_Bool bSynchron = sal_False ); sal_Bool bSynchron = sal_False );
sal_Bool SetData( const String & rMimeType, sal_Bool SetData( const String & rMimeType,
......
...@@ -40,7 +40,7 @@ SwServerObject::~SwServerObject() ...@@ -40,7 +40,7 @@ SwServerObject::~SwServerObject()
} }
sal_Bool SwServerObject::GetData( uno::Any & rData, sal_Bool SwServerObject::GetData( uno::Any & rData,
const String & rMimeType, sal_Bool ) const OUString & rMimeType, sal_Bool )
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
WriterRef xWrt; WriterRef xWrt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment