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

convert sc/inc/l*.hxx from String to OUString

Change-Id: I52f9989cead1fc84e659fe0e4180a9c85388355d
üst dc2710a5
......@@ -66,7 +66,7 @@ class ScSheetLinkObj : public cppu::WeakImplHelper4<
private:
SfxItemPropertySet aPropSet;
ScDocShell* pDocShell;
String aFileName;
OUString aFileName;
XRefreshListenerArr_Impl aRefreshListeners;
ScTableLink* GetLink_Impl() const;
......@@ -74,7 +74,7 @@ private:
void ModifyRefreshDelay_Impl( sal_Int32 nRefresh );
public:
ScSheetLinkObj(ScDocShell* pDocSh, const String& rName);
ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName);
virtual ~ScSheetLinkObj();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
......@@ -378,16 +378,16 @@ class ScDDELinkObj : public cppu::WeakImplHelper5<
{
private:
ScDocShell* pDocShell;
String aAppl;
String aTopic;
String aItem;
OUString aAppl;
OUString aTopic;
OUString aItem;
XRefreshListenerArr_Impl aRefreshListeners;
void Refreshed_Impl();
public:
ScDDELinkObj(ScDocShell* pDocSh, const String& rA,
const String& rT, const String& rI);
ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
const OUString& rT, const OUString& rI);
virtual ~ScDDELinkObj();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
......
......@@ -63,7 +63,7 @@ public:
union
{
double mfVal;
const String * mpStr;
const OUString *mpStr;
};
bool mbAlloc : 1;
bool mbString : 1;
......@@ -94,7 +94,7 @@ public:
mfVal = fVal;
}
void setString( const String * pStr )
void setString( const OUString * pStr )
{
deleteString();
mbAlloc = false;
......@@ -102,11 +102,11 @@ public:
mpStr = pStr;
}
void setString( const String & rStr )
void setString( const OUString & rStr )
{
deleteString();
mbAlloc = mbString = true;
mpStr = new String( rStr);
mpStr = new OUString( rStr);
}
bool operator==( const QueryCriteria & r ) const
......
......@@ -56,7 +56,7 @@ ScLookupCache::QueryCriteria::QueryCriteria( const ScLookupCache::QueryCriteria
{
if (r.mbString && r.mpStr)
{
mpStr = new String( *r.mpStr);
mpStr = new OUString( *r.mpStr);
mbAlloc = mbString = true;
}
}
......
......@@ -76,7 +76,7 @@ SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.
//------------------------------------------------------------------------
ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const String& rName) :
ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) :
aPropSet( lcl_GetSheetLinkMap() ),
pDocShell( pDocSh ),
aFileName( rName )
......@@ -1045,8 +1045,8 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException)
//------------------------------------------------------------------------
ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const String& rA,
const String& rT, const String& rI) :
ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
const OUString& rT, const OUString& rI) :
pDocShell( pDocSh ),
aAppl( rA ),
aTopic( rT ),
......
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