[Libreoffice-commits] core.git: sw/source

[Justin Luth]

 sw/source/ui/frmdlg/frmpage.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3eaeefe83772bacad4fe5e0f35bbf52b2590e835
Author: Justin Luth <justin_luth at sil.org>
Date:   Thu Feb 19 10:16:53 2015 +0300

    allow generated, unique frame name to be saved
    
    The document in tdf#77122 shows that frames can exist without a
    name. Going to frame properties showed "Frame1" as the name for each
    frame, and pressing OK didn't "set" this suggested name - the name
    remained blank.
    
    An alternative fix is removing "pNameED->SaveValue();".  However,
    this approach seems safer.
    
    Change-Id: I1ed9d67442d55f2c481e6e4b35a876721a835522
    Reviewed-on: https://gerrit.libreoffice.org/14548
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6ad97d5..743e576 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2904,6 +2904,8 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
                 aTmpName1 = pWrtSh->GetUniqueOLEName();
             else
                 aTmpName1 = pWrtSh->GetUniqueFrameName();
+
+            pWrtSh->SetFlyName(aTmpName1);
         }
 
         pNameED->SetText( aTmpName1 );