Kaydet (Commit) 9453d3d4 authored tarafından Caolán McNamara's avatar Caolán McNamara

always show preview in autotext dialog

Change-Id: I4fe95db707cdaafb220435f281cce88284afd26d
üst 7e2b1e92
...@@ -93,8 +93,6 @@ class SwGlossaryDlg : public SvxStandardDialog ...@@ -93,8 +93,6 @@ class SwGlossaryDlg : public SvxStandardDialog
CheckBox* m_pFileRelCB; CheckBox* m_pFileRelCB;
CheckBox* m_pNetRelCB; CheckBox* m_pNetRelCB;
Window* m_pExampleWIN; Window* m_pExampleWIN;
Window* m_pExampleDummyWIN;
CheckBox* m_pShowExampleCB;
PushButton* m_pInsertBtn; PushButton* m_pInsertBtn;
CloseButton* m_pCloseBtn; CloseButton* m_pCloseBtn;
MenuButton* m_pEditBtn; MenuButton* m_pEditBtn;
...@@ -121,6 +119,7 @@ class SwGlossaryDlg : public SvxStandardDialog ...@@ -121,6 +119,7 @@ class SwGlossaryDlg : public SvxStandardDialog
SwWrtShell* pSh; SwWrtShell* pSh;
void EnableShortName(sal_Bool bOn = sal_True); void EnableShortName(sal_Bool bOn = sal_True);
void ShowPreview();
DECL_LINK( NameModify, Edit * ); DECL_LINK( NameModify, Edit * );
DECL_LINK( NameDoubleClick, SvTreeListBox * ); DECL_LINK( NameDoubleClick, SvTreeListBox * );
...@@ -132,7 +131,6 @@ class SwGlossaryDlg : public SvxStandardDialog ...@@ -132,7 +131,6 @@ class SwGlossaryDlg : public SvxStandardDialog
DECL_LINK(InsertHdl, void *); DECL_LINK(InsertHdl, void *);
DECL_LINK( PathHdl, Button * ); DECL_LINK( PathHdl, Button * );
DECL_LINK( CheckBoxHdl, CheckBox * ); DECL_LINK( CheckBoxHdl, CheckBox * );
DECL_LINK( ShowPreviewHdl, CheckBox * );
DECL_LINK( PreviewLoadedHdl, void * ); DECL_LINK( PreviewLoadedHdl, void * );
......
...@@ -206,12 +206,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, ...@@ -206,12 +206,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
get(m_pCategoryBox, "category"); get(m_pCategoryBox, "category");
get(m_pFileRelCB, "relfile"); get(m_pFileRelCB, "relfile");
get(m_pNetRelCB, "relnet"); get(m_pNetRelCB, "relnet");
get(m_pShowExampleCB, "showpreview");
get(m_pInsertBtn, "insert"); get(m_pInsertBtn, "insert");
get(m_pBibBtn, "categories"); get(m_pBibBtn, "categories");
get(m_pPathBtn, "path"); get(m_pPathBtn, "path");
get(m_pExampleWIN, "example"); get(m_pExampleWIN, "example");
get(m_pExampleDummyWIN, "dummy");
get(m_pEditBtn, "autotext"); get(m_pEditBtn, "autotext");
SvtLinguConfig aLocalLinguConfig; SvtLinguConfig aLocalLinguConfig;
...@@ -233,14 +231,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, ...@@ -233,14 +231,10 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
m_pCategoryBox->SetDoubleClickHdl(LINK(this,SwGlossaryDlg, NameDoubleClick)); m_pCategoryBox->SetDoubleClickHdl(LINK(this,SwGlossaryDlg, NameDoubleClick));
m_pCategoryBox->SetSelectHdl(LINK(this,SwGlossaryDlg,GrpSelect)); m_pCategoryBox->SetSelectHdl(LINK(this,SwGlossaryDlg,GrpSelect));
m_pBibBtn->SetClickHdl(LINK(this,SwGlossaryDlg,BibHdl)); m_pBibBtn->SetClickHdl(LINK(this,SwGlossaryDlg,BibHdl));
m_pShowExampleCB->SetClickHdl(LINK(this, SwGlossaryDlg, ShowPreviewHdl));
m_pInsertBtn->SetClickHdl(LINK(this,SwGlossaryDlg,InsertHdl)); m_pInsertBtn->SetClickHdl(LINK(this,SwGlossaryDlg,InsertHdl));
const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); ShowPreview();
m_pShowExampleCB->Check( rCfg.IsAutoTextPreview());
ShowPreviewHdl(m_pShowExampleCB);
bIsDocReadOnly = pSh->GetView().GetDocShell()->IsReadOnly() || bIsDocReadOnly = pSh->GetView().GetDocShell()->IsReadOnly() ||
pSh->HasReadonlySel(); pSh->HasReadonlySel();
...@@ -260,9 +254,6 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, ...@@ -260,9 +254,6 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryDlg::~SwGlossaryDlg() SwGlossaryDlg::~SwGlossaryDlg()
{ {
SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
rCfg.SetAutoTextPreview(m_pShowExampleCB->IsChecked()) ;
m_pCategoryBox->Clear(); m_pCategoryBox->Clear();
delete pExampleFrame; delete pExampleFrame;
} }
...@@ -1125,35 +1116,22 @@ IMPL_LINK_NOARG(SwGlossaryDlg, InsertHdl) ...@@ -1125,35 +1116,22 @@ IMPL_LINK_NOARG(SwGlossaryDlg, InsertHdl)
return 0; return 0;
} }
IMPL_LINK( SwGlossaryDlg, ShowPreviewHdl, CheckBox *, pBox ) void SwGlossaryDlg::ShowPreview()
{ {
sal_Bool bCreated = sal_False;
if(pBox->IsChecked())
{
//create example //create example
if(!pExampleFrame) if (!pExampleFrame)
{ {
Link aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl)); Link aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl));
pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN, pExampleFrame = new SwOneExampleFrame( *m_pExampleWIN,
EX_SHOW_ONLINE_LAYOUT, &aLink ); EX_SHOW_ONLINE_LAYOUT, &aLink );
bCreated = sal_True;
}
} }
sal_Bool bShow = pBox->IsChecked() && !bCreated; if (::GetCurrGlosGroup())
m_pExampleWIN->Show( bShow );
m_pExampleDummyWIN->Show(!bShow);
if( ::GetCurrGlosGroup() )
ShowAutoText(*::GetCurrGlosGroup(), m_pShortNameEdit->GetText()); ShowAutoText(*::GetCurrGlosGroup(), m_pShortNameEdit->GetText());
return 0;
}; };
IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl) IMPL_LINK_NOARG(SwGlossaryDlg, PreviewLoadedHdl)
{ {
sal_Bool bShow = m_pShowExampleCB->IsChecked();
m_pExampleWIN->Show( bShow );
m_pExampleDummyWIN->Show(!bShow);
ResumeShowAutoText(); ResumeShowAutoText();
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment