commit 18d636063fd7be165e7888af49372a6e2b851776
author Caolán McNamara <caolanm@redhat.com> Mon Jun 19 09:46:31 2017 +0100
committer Caolán McNamara <caolanm@redhat.com> Mon Jun 19 13:32:01 2017 +0200
tree 7e272d9a34aa715af3b19faef384d2f3b64e229a
parent 0df3de34ad775d6d3c49036c03c3f6dad7141536

ofz: use OString instead of bare char*

Change-Id: I2f7bfbd62c0a5477f0cbb38e86684db4fdb9c37f
Reviewed-on: https://gerrit.libreoffice.org/38952
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

lotuswordpro/source/filter/benlist.cxx

diff --git a/lotuswordpro/source/filter/benlist.cxx b/lotuswordpro/source/filter/benlist.cxx
index c80013f..e092c7c 100644
--- a/lotuswordpro/source/filter/benlist.cxx
+++ b/lotuswordpro/source/filter/benlist.cxx
@@ -58,7 +58,7 @@ namespace OpenStormBento
{

CBenNamedObject *
FindNamedObject(CUtList * pList, const char * sName,
FindNamedObject(CUtList * pList, const OString& rName,
  CUtListElmt ** ppPrev)
{
    CUtListElmt& rTerminating = pList->GetTerminating();
@@ -68,8 +68,8 @@ FindNamedObject(CUtList * pList, const char * sName,
        CBenNamedObjectListElmt * pCurrNamedObjectListElmt =
          static_cast<CBenNamedObjectListElmt *>(pCurr);

        int Comp = strcmp(sName, pCurrNamedObjectListElmt->GetNamedObject()->
          GetNameCStr());
        sal_Int32 Comp = rName.compareTo(pCurrNamedObjectListElmt->GetNamedObject()->
          GetName());

        if (Comp == 0)
            return pCurrNamedObjectListElmt->GetNamedObject();

lotuswordpro/source/filter/bento.hxx

diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 2082897..53fce53 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -347,7 +347,7 @@ public: // Internal methods
    CUtListElmt * pPrevObject, const OString& rName,
    CUtListElmt * pPrevNamedObjectListElmt);

    const char * GetNameCStr() { return csName.getStr(); }
    const OString& GetName() { return csName; }

private: // Data
    OString csName;

lotuswordpro/source/filter/first.hxx

diff --git a/lotuswordpro/source/filter/first.hxx b/lotuswordpro/source/filter/first.hxx
index 54c55e3..3b412b5 100644
--- a/lotuswordpro/source/filter/first.hxx
+++ b/lotuswordpro/source/filter/first.hxx
@@ -64,7 +64,7 @@ namespace OpenStormBento
// String constants
extern const char gsBenMagicBytes[];

CBenNamedObject * FindNamedObject(CUtList * pList, const char * sName,
CBenNamedObject * FindNamedObject(CUtList * pList, const OString& rName,
  CUtListElmt ** ppPrev);

CBenIDListElmt * FindID(CUtList * pList, BenObjectID ObjectID,

lotuswordpro/source/filter/tocread.cxx

diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index ffd1bb5..be8a7b1 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -296,9 +296,11 @@ CBenTOCReader::ReadTOC()
                        return Err;
                    }

                    OString sName(sBuffer, Length);

                    CUtListElmt * pPrevNamedObjectListElmt;
                    if (FindNamedObject(&cpContainer->GetNamedObjects(),
                      sBuffer, &pPrevNamedObjectListElmt) != nullptr)
                      sName, &pPrevNamedObjectListElmt) != nullptr)
                    {
                        delete[] sAllocBuffer;
                        return BenErr_DuplicateName;
@@ -309,9 +311,9 @@ CBenTOCReader::ReadTOC()

                    if (PropertyID == BEN_PROPID_GLOBAL_PROPERTY_NAME)
                        pObject = new CBenPropertyName(cpContainer, ObjectID,
                          pPrevObject, OString(sBuffer, Length), pPrevNamedObjectListElmt);
                          pPrevObject, sName, pPrevNamedObjectListElmt);
                    else pObject = new CBenTypeName(cpContainer, ObjectID,
                      pPrevObject, OString(sBuffer, Length), pPrevNamedObjectListElmt);
                      pPrevObject, sName, pPrevNamedObjectListElmt);

                    delete[] sAllocBuffer;
                }