diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-12 12:00:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-12 15:01:05 +0200 |
| commit | b5302844af49cc25c0720f3c2dccbdc0380d3b50 (patch) | |
| tree | e72053eee16b8135eafa0e585445791f9734453f /lotuswordpro | |
| parent | eb8e28d80e1a2dbb0740c486d4e1ebf3df87898c (diff) | |
ofz: use our own OString instead
Change-Id: I583a95aea0b29878bf4749a8cb2bb684da6da1e5
Reviewed-on: https://gerrit.libreoffice.org/37535
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/benname.cxx | 4 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/bento.hxx | 14 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/tocread.cxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lotuswordpro/source/filter/benname.cxx b/lotuswordpro/source/filter/benname.cxx index 733906de250c..9cdfd5b7c2f7 100644 --- a/lotuswordpro/source/filter/benname.cxx +++ b/lotuswordpro/source/filter/benname.cxx @@ -59,10 +59,10 @@ namespace OpenStormBento { // changed to remove warning CBenNamedObject::CBenNamedObject(LtcBenContainer * pContainer, - BenObjectID ObjectID, CUtListElmt * pPrevObject, const char * sName, + BenObjectID ObjectID, CUtListElmt * pPrevObject, const OString& rName, CUtListElmt * pPrevNamedObjectListElmt) : CBenObject(pContainer, ObjectID, pPrevObject) - , csName(sName) + , csName(rName) , cNameListElmt(pPrevNamedObjectListElmt) { cNameListElmt.SetNamedObject(this); diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 9471590ed6ef..2082897b09e4 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -344,13 +344,13 @@ public: // Methods public: // Internal methods CBenNamedObject(LtcBenContainer * pContainer, BenObjectID ObjectID, - CUtListElmt * pPrevObject, const char * sName, + CUtListElmt * pPrevObject, const OString& rName, CUtListElmt * pPrevNamedObjectListElmt); - const char * GetNameCStr() { return csName.c_str(); } + const char * GetNameCStr() { return csName.getStr(); } private: // Data - std::string csName; + OString csName; CBenNamedObjectListElmt cNameListElmt; }; @@ -358,9 +358,9 @@ class CBenPropertyName : public CBenNamedObject { public: // Internal methods CBenPropertyName(LtcBenContainer * pContainer, BenObjectID ObjectID, - CUtListElmt * pPrevObject, const char * sName, + CUtListElmt * pPrevObject, const OString& rName, CUtListElmt * pPrevNamedObjectListElmt) : - CBenNamedObject(pContainer, ObjectID, pPrevObject, sName, + CBenNamedObject(pContainer, ObjectID, pPrevObject, rName, pPrevNamedObjectListElmt) { ; } virtual bool IsPropertyName() override; }; @@ -369,9 +369,9 @@ class CBenTypeName : public CBenNamedObject { public: // Internal methods CBenTypeName(LtcBenContainer * pContainer, BenObjectID ObjectID, - CBenObject * pPrevObject, const char * sName, + CBenObject * pPrevObject, const OString& rName, CUtListElmt * pPrevNamedObjectListElmt) : - CBenNamedObject(pContainer, ObjectID, pPrevObject, sName, + CBenNamedObject(pContainer, ObjectID, pPrevObject, rName, pPrevNamedObjectListElmt) { ; } }; diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 8e7e79a855e4..ffd1bb52d409 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -309,9 +309,9 @@ CBenTOCReader::ReadTOC() if (PropertyID == BEN_PROPID_GLOBAL_PROPERTY_NAME) pObject = new CBenPropertyName(cpContainer, ObjectID, - pPrevObject, sBuffer, pPrevNamedObjectListElmt); + pPrevObject, OString(sBuffer, Length), pPrevNamedObjectListElmt); else pObject = new CBenTypeName(cpContainer, ObjectID, - pPrevObject, sBuffer, pPrevNamedObjectListElmt); + pPrevObject, OString(sBuffer, Length), pPrevNamedObjectListElmt); delete[] sAllocBuffer; } |