Kaydet (Commit) 18d63606 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz: use OString instead of bare char*

Change-Id: I2f7bfbd62c0a5477f0cbb38e86684db4fdb9c37f
Reviewed-on: https://gerrit.libreoffice.org/38952Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0df3de34
...@@ -58,7 +58,7 @@ namespace OpenStormBento ...@@ -58,7 +58,7 @@ namespace OpenStormBento
{ {
CBenNamedObject * CBenNamedObject *
FindNamedObject(CUtList * pList, const char * sName, FindNamedObject(CUtList * pList, const OString& rName,
CUtListElmt ** ppPrev) CUtListElmt ** ppPrev)
{ {
CUtListElmt& rTerminating = pList->GetTerminating(); CUtListElmt& rTerminating = pList->GetTerminating();
...@@ -68,8 +68,8 @@ FindNamedObject(CUtList * pList, const char * sName, ...@@ -68,8 +68,8 @@ FindNamedObject(CUtList * pList, const char * sName,
CBenNamedObjectListElmt * pCurrNamedObjectListElmt = CBenNamedObjectListElmt * pCurrNamedObjectListElmt =
static_cast<CBenNamedObjectListElmt *>(pCurr); static_cast<CBenNamedObjectListElmt *>(pCurr);
int Comp = strcmp(sName, pCurrNamedObjectListElmt->GetNamedObject()-> sal_Int32 Comp = rName.compareTo(pCurrNamedObjectListElmt->GetNamedObject()->
GetNameCStr()); GetName());
if (Comp == 0) if (Comp == 0)
return pCurrNamedObjectListElmt->GetNamedObject(); return pCurrNamedObjectListElmt->GetNamedObject();
......
...@@ -347,7 +347,7 @@ public: // Internal methods ...@@ -347,7 +347,7 @@ public: // Internal methods
CUtListElmt * pPrevObject, const OString& rName, CUtListElmt * pPrevObject, const OString& rName,
CUtListElmt * pPrevNamedObjectListElmt); CUtListElmt * pPrevNamedObjectListElmt);
const char * GetNameCStr() { return csName.getStr(); } const OString& GetName() { return csName; }
private: // Data private: // Data
OString csName; OString csName;
......
...@@ -64,7 +64,7 @@ namespace OpenStormBento ...@@ -64,7 +64,7 @@ namespace OpenStormBento
// String constants // String constants
extern const char gsBenMagicBytes[]; extern const char gsBenMagicBytes[];
CBenNamedObject * FindNamedObject(CUtList * pList, const char * sName, CBenNamedObject * FindNamedObject(CUtList * pList, const OString& rName,
CUtListElmt ** ppPrev); CUtListElmt ** ppPrev);
CBenIDListElmt * FindID(CUtList * pList, BenObjectID ObjectID, CBenIDListElmt * FindID(CUtList * pList, BenObjectID ObjectID,
......
...@@ -296,9 +296,11 @@ CBenTOCReader::ReadTOC() ...@@ -296,9 +296,11 @@ CBenTOCReader::ReadTOC()
return Err; return Err;
} }
OString sName(sBuffer, Length);
CUtListElmt * pPrevNamedObjectListElmt; CUtListElmt * pPrevNamedObjectListElmt;
if (FindNamedObject(&cpContainer->GetNamedObjects(), if (FindNamedObject(&cpContainer->GetNamedObjects(),
sBuffer, &pPrevNamedObjectListElmt) != nullptr) sName, &pPrevNamedObjectListElmt) != nullptr)
{ {
delete[] sAllocBuffer; delete[] sAllocBuffer;
return BenErr_DuplicateName; return BenErr_DuplicateName;
...@@ -309,9 +311,9 @@ CBenTOCReader::ReadTOC() ...@@ -309,9 +311,9 @@ CBenTOCReader::ReadTOC()
if (PropertyID == BEN_PROPID_GLOBAL_PROPERTY_NAME) if (PropertyID == BEN_PROPID_GLOBAL_PROPERTY_NAME)
pObject = new CBenPropertyName(cpContainer, ObjectID, pObject = new CBenPropertyName(cpContainer, ObjectID,
pPrevObject, OString(sBuffer, Length), pPrevNamedObjectListElmt); pPrevObject, sName, pPrevNamedObjectListElmt);
else pObject = new CBenTypeName(cpContainer, ObjectID, else pObject = new CBenTypeName(cpContainer, ObjectID,
pPrevObject, OString(sBuffer, Length), pPrevNamedObjectListElmt); pPrevObject, sName, pPrevNamedObjectListElmt);
delete[] sAllocBuffer; delete[] sAllocBuffer;
} }
......
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