weld SwLabPreview

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

1 files changed, 17 insertions, 15 deletions

diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 6ff18b882716..e3537834932f 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -272,21 +272,6 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pTypeBox->SetSelectHdl(LINK(this, SwLabPage, TypeHdl         ));
 
     InitDatabaseBox();
-
-    size_t nLstGroup = 0;
-
-    const size_t nCount = GetParentSwLabDlg()->Makes().size();
-    for(size_t i = 0; i < nCount; ++i)
-    {
-        OUString& rStr = GetParentSwLabDlg()->Makes()[i];
-        m_pMakeBox->InsertEntry( rStr );
-
-        if ( rStr == aItem.m_aLstMake)
-            nLstGroup = i;
-    }
-
-    m_pMakeBox->SelectEntryPos( nLstGroup );
-    m_pMakeBox->GetSelectHdl().Call(*m_pMakeBox);
 }
 
 SwLabPage::~SwLabPage()
@@ -526,6 +511,23 @@ bool SwLabPage::FillItemSet(SfxItemSet* rSet)
 
 void SwLabPage::Reset(const SfxItemSet* rSet)
 {
+    m_pMakeBox->Clear();
+
+    size_t nLstGroup = 0;
+
+    const size_t nCount = GetParentSwLabDlg()->Makes().size();
+    for(size_t i = 0; i < nCount; ++i)
+    {
+        OUString& rStr = GetParentSwLabDlg()->Makes()[i];
+        m_pMakeBox->InsertEntry( rStr );
+
+        if ( rStr == aItem.m_aLstMake)
+            nLstGroup = i;
+    }
+
+    m_pMakeBox->SelectEntryPos( nLstGroup );
+    m_pMakeBox->GetSelectHdl().Call(*m_pMakeBox);
+
     aItem = static_cast<const SwLabItem&>( rSet->Get(FN_LABEL));
     OUString sDBName  = aItem.m_sDBName;