commit 91afe5519613bc64f344b5bc7e7fee982a859280
author Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 10 09:34:07 2017 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 10 11:40:27 2017 +0200
tree 6c86c76ad313dab4f2e02f2b0138d7e368ca3e95
parent 5ab0d0a69ff65eaef1bf043526040b1230fcdb89

loplugin:inlinefields in SfxSaveAsTemplateDialog

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

include/sfx2/saveastemplatedlg.hxx

diff --git a/include/sfx2/saveastemplatedlg.hxx b/include/sfx2/saveastemplatedlg.hxx
index 212e4578..9c01a49 100644
--- a/include/sfx2/saveastemplatedlg.hxx
+++ b/include/sfx2/saveastemplatedlg.hxx
@@ -12,14 +12,13 @@

#include <sal/config.h>
#include <sfx2/dllapi.h>

#include <sfx2/doctempl.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>

class Edit;
class ListBox;
class CheckBox;
class SfxDocumentTemplates;

//  class SfxSaveAsTemplateDialog -------------------------------------------------------------------

@@ -32,13 +31,13 @@ private:
    VclPtr<Edit>            mpTemplateNameEdit;
    VclPtr<PushButton>      mpOKButton;

    OUString     msSelectedCategory;
    OUString     msTemplateName;
    sal_uInt16   mnRegionPos;
    OUString                msSelectedCategory;
    OUString                msTemplateName;
    sal_uInt16              mnRegionPos;

    std::vector<OUString> msCategories;
    std::vector<OUString>   msCategories;

    SfxDocumentTemplates *mpDocTemplates;
    SfxDocumentTemplates    maDocTemplates;

    css::uno::Reference< css::frame::XModel > m_xModel;

sfx2/source/doc/saveastemplatedlg.cxx

diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index 1aadfeb..746c0ed 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -37,8 +37,7 @@ SfxSaveAsTemplateDialog::SfxSaveAsTemplateDialog():
        ModalDialog(nullptr, "SaveAsTemplateDialog", "sfx/ui/saveastemplatedlg.ui"),
        msSelectedCategory(OUString()),
        msTemplateName(OUString()),
        mnRegionPos(0),
        mpDocTemplates(new SfxDocumentTemplates)
        mnRegionPos(0)
{
    get(mpLBCategory, "categorylb");
    get(mpCBXDefault, "defaultcb");
@@ -121,10 +120,10 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void)

void SfxSaveAsTemplateDialog::initialize()
{
    sal_uInt16 nCount = mpDocTemplates->GetRegionCount();
    sal_uInt16 nCount = maDocTemplates.GetRegionCount();
    for (sal_uInt16 i = 0; i < nCount; ++i)
    {
        OUString sCategoryName(mpDocTemplates->GetFullRegionName(i));
        OUString sCategoryName(maDocTemplates.GetFullRegionName(i));
        msCategories.push_back(sCategoryName);
    }
}
@@ -145,10 +144,10 @@ bool SfxSaveAsTemplateDialog::IsTemplateNameUnique()
    it=find(msCategories.begin(), msCategories.end(), msSelectedCategory);
    mnRegionPos = std::distance(msCategories.begin(), it);

    sal_uInt16 nEntries = mpDocTemplates->GetCount(mnRegionPos);
    sal_uInt16 nEntries = maDocTemplates.GetCount(mnRegionPos);
    for(sal_uInt16 i = 0; i < nEntries; i++)
    {
        OUString aName = mpDocTemplates->GetName(mnRegionPos, i);
        OUString aName = maDocTemplates.GetName(mnRegionPos, i);
        if(aName == msTemplateName)
            return false;
    }
@@ -165,9 +164,9 @@ bool SfxSaveAsTemplateDialog::SaveTemplate()
    if (!xTemplates->storeTemplate( msSelectedCategory, msTemplateName, xStorable ))
        return false;

    sal_uInt16 nDocId = mpDocTemplates->GetCount(mnRegionPos);
    OUString     sURL = mpDocTemplates->GetTemplateTargetURLFromComponent(msSelectedCategory, msTemplateName);
    bool bIsSaved = mpDocTemplates->InsertTemplate( mnRegionPos, nDocId, msTemplateName, sURL);
    sal_uInt16 nDocId = maDocTemplates.GetCount(mnRegionPos);
    OUString     sURL = maDocTemplates.GetTemplateTargetURLFromComponent(msSelectedCategory, msTemplateName);
    bool bIsSaved = maDocTemplates.InsertTemplate( mnRegionPos, nDocId, msTemplateName, sURL);

    if (!bIsSaved)
        return false;
@@ -194,7 +193,7 @@ bool SfxSaveAsTemplateDialog::SaveTemplate()
            SfxObjectFactory::SetStandardTemplate(aServiceName, sURL);
    }

    mpDocTemplates->Update();
    maDocTemplates.Update();
    return true;
}