always show preview in autotext dialog

Change-Id: I4fe95db707cdaafb220435f281cce88284afd26d

2 files changed, 9 insertions, 33 deletions

diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index 94b4ce5413aa..42240e15793c 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -93,8 +93,6 @@ class SwGlossaryDlg : public SvxStandardDialog
     CheckBox*       m_pFileRelCB;
     CheckBox*       m_pNetRelCB;
     Window*         m_pExampleWIN;
-    Window*         m_pExampleDummyWIN;
-    CheckBox*       m_pShowExampleCB;
     PushButton*     m_pInsertBtn;
     CloseButton*    m_pCloseBtn;
     MenuButton*     m_pEditBtn;
@@ -121,6 +119,7 @@ class SwGlossaryDlg : public SvxStandardDialog
     SwWrtShell*     pSh;
 
     void EnableShortName(sal_Bool bOn = sal_True);
+    void ShowPreview();
 
     DECL_LINK( NameModify, Edit * );
     DECL_LINK( NameDoubleClick, SvTreeListBox * );
@@ -132,7 +131,6 @@ class SwGlossaryDlg : public SvxStandardDialog
     DECL_LINK(InsertHdl, void *);
     DECL_LINK( PathHdl, Button * );
     DECL_LINK( CheckBoxHdl, CheckBox * );
-    DECL_LINK( ShowPreviewHdl, CheckBox * );
     DECL_LINK( PreviewLoadedHdl, void * );
 
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 140fea78e832..be6adaa32b23 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -206,12 +206,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
     get(m_pCategoryBox, "category");
     get(m_pFileRelCB, "relfile");
     get(m_pNetRelCB, "relnet");
-    get(m_pShowExampleCB, "showpreview");
     get(m_pInsertBtn, "insert");
     get(m_pBibBtn, "categories");
     get(m_pPathBtn, "path");
     get(m_pExampleWIN, "example");
-    get(m_pExampleDummyWIN, "dummy");
     get(m_pEditBtn, "autotext");
 
     SvtLinguConfig aLocalLinguConfig;
@@ -233,14 +231,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
     m_pCategoryBox->SetDoubleClickHdl(LINK(this,SwGlossaryDlg, NameDoubleClick));
     m_pCategoryBox->SetSelectHdl(LINK(this,SwGlossaryDlg,GrpSelect));
     m_pBibBtn->SetClickHdl(LINK(this,SwGlossaryDlg,BibHdl));
-    m_pShowExampleCB->SetClickHdl(LINK(this, SwGlossaryDlg, ShowPreviewHdl));
 
     m_pInsertBtn->SetClickHdl(LINK(this,SwGlossaryDlg,InsertHdl));
 
-    const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
-
-    m_pShowExampleCB->Check( rCfg.IsAutoTextPreview());
-    ShowPreviewHdl(m_pShowExampleCB);
+    ShowPreview();
 
     bIsDocReadOnly = pSh->GetView().GetDocShell()->IsReadOnly() ||
                       pSh->HasReadonlySel();
@@ -260,9 +254,6 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
 
 SwGlossaryDlg::~SwGlossaryDlg()
 {
-    SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
-    rCfg.SetAutoTextPreview(m_pShowExampleCB->IsChecked()) ;
-
     m_pCategoryBox->Clear();
     delete pExampleFrame;
 }
@@ -1125,35 +1116,22 @@ IMPL_LINK_NOARG(SwGlossaryDlg, InsertHdl)
     return 0;
 }
 
-IMPL_LINK( SwGlossaryDlg, ShowPreviewHdl, CheckBox *, pBox )
+void SwGlossaryDlg::ShowPreview()
 {
-    sal_Bool bCreated = sal_False;
-    if(pBox->IsChecked())
+    //create example
+    if (!pExampleFrame)
     {
-        //create example
-        if(!pExampleFrame)
-        {
-            Link aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl));
-            pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN,
-                            EX_SHOW_ONLINE_LAYOUT, &aLink );
-            bCreated = sal_True;
-        }
+        Link aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl));
+        pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN,
+                        EX_SHOW_ONLINE_LAYOUT, &aLink );
     }
 
-    sal_Bool bShow = pBox->IsChecked() && !bCreated;
-    m_pExampleWIN->Show( bShow );
-    m_pExampleDummyWIN->Show(!bShow);
-    if( ::GetCurrGlosGroup() )
+    if (::GetCurrGlosGroup())
         ShowAutoText(*::GetCurrGlosGroup(), m_pShortNameEdit->GetText());
-
-    return 0;
 };
 
 IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl)
 {
-    sal_Bool bShow = m_pShowExampleCB->IsChecked();
-    m_pExampleWIN->Show( bShow );
-    m_pExampleDummyWIN->Show(!bShow);
     ResumeShowAutoText();
     return 0;
 }