commit cae452a167b78d8dc164059db8a9fbe1eb3d521d
author Noel Grandin <noel.grandin@collabora.co.uk> Wed Jan 17 17:09:14 2018 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Thu Jan 25 07:24:31 2018 +0100
tree 8772a61352fd283b55ad02e30c88bfe4dae1fa2c
parent 6a579702b1128372aa30c86156996e57ba73b2c8

loplugin:useuniqueptr in XMLTextFieldExport

Change-Id: I2b3e1ec5454bc3486fb41b010091adc549500daf
Reviewed-on: https://gerrit.libreoffice.org/48512
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

xmloff/inc/txtflde.hxx

diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 5f7fd45..34c8670 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -32,6 +32,7 @@

#include <map>
#include <set>
#include <memory>


class SvXMLExport;
@@ -151,9 +152,9 @@ class XMLTextFieldExport final
    SvXMLExport& rExport;

    /// store used text field master names (NULL means: don't collect)
    ::std::map<
    std::unique_ptr< ::std::map<
            css::uno::Reference< css::text::XText >,
            ::std::set< OUString > > *
            ::std::set< OUString > > >
        pUsedMasters;

public:
@@ -481,7 +482,7 @@ private:
    const OUString sPropertyTooltip;
    const OUString sPropertyTextRange;

    XMLPropertyState* pCombinedCharactersPropertyState;
    std::unique_ptr<XMLPropertyState> pCombinedCharactersPropertyState;

};

xmloff/source/text/txtflde.cxx

diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 946b5f8..c2d52cf 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -274,7 +274,6 @@ inline Sequence<OUString> const GetStringSequenceProperty(
XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
                                        XMLPropertyState* pCombinedCharState)
    : rExport(rExp),
      pUsedMasters(nullptr),
      sServicePrefix("com.sun.star.text.textfield."),
      sFieldMasterPrefix("com.sun.star.text.FieldMaster."),
      sPresentationServicePrefix("com.sun.star.presentation.TextField."),
@@ -352,8 +351,6 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,

XMLTextFieldExport::~XMLTextFieldExport()
{
    delete pCombinedCharactersPropertyState;
    delete pUsedMasters;
}

/// get the field ID (as in FieldIDEnum) from XTextField
@@ -882,7 +879,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
        // export text style with the addition of the combined characters
        DBG_ASSERT(nullptr != pCombinedCharactersPropertyState,
                   "need proper PropertyState for combined characters");
        const XMLPropertyState *aStates[] = { pCombinedCharactersPropertyState, nullptr };
        const XMLPropertyState *aStates[] = { pCombinedCharactersPropertyState.get(), nullptr };
        GetExport().GetTextParagraphExport()->Add(
            XML_STYLE_FAMILY_TEXT_TEXT, xRangePropSet,
            aStates);
@@ -969,7 +966,7 @@ void XMLTextFieldExport::ExportField(

    // special treatment for combined characters field, because it is
    // exported as a style
    const XMLPropertyState* aStates[] = { pCombinedCharactersPropertyState, nullptr };
    const XMLPropertyState* aStates[] = { pCombinedCharactersPropertyState.get(), nullptr };
    const XMLPropertyState **pStates =
                FIELD_ID_COMBINED_CHARACTERS == nToken
                    ? aStates
@@ -2189,12 +2186,11 @@ void XMLTextFieldExport::ExportFieldDeclarations(
void XMLTextFieldExport::SetExportOnlyUsedFieldDeclarations(
    bool bExportOnlyUsed)
{
    delete pUsedMasters;
    pUsedMasters = nullptr;
    pUsedMasters.reset();

    // create used masters set (if none is used)
    if (bExportOnlyUsed)
        pUsedMasters = new map<Reference<XText>, set<OUString> > ;
        pUsedMasters.reset( new map<Reference<XText>, set<OUString> > );
}

void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName,