diff options
| -rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/inc/cption.hxx | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 93424cf6fcc7..dbd3543e0f58 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -85,7 +85,7 @@ OUString SwCaptionDialog::our_aSepTextSave(": "); // Caption separator text //Resolves: fdo#47427 disallow typing *or* pasting content into the category box OUString TextFilterAutoConvert::filter(const OUString &rText) { - if (!SwCalc::IsValidVarName(rText)) + if (rText != m_sNone && !SwCalc::IsValidVarName(rText)) return m_sLastGoodText; m_sLastGoodText = rText; return rText; @@ -94,6 +94,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText) SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ), m_sNone( SW_RESSTR(SW_STR_NONE) ), + m_aTextFilter(m_sNone), rView( rV ), pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ), bCopyAttributes( false ), @@ -283,7 +284,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton ) { OUString sFldTypeName = m_pCategoryBox->GetText(); if(sFldTypeName == m_sNone) - sFldTypeName.clear(); + sFldTypeName = OUString(); SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName ); aDlg.SetApplyBorderAndShadow(bCopyAttributes); aDlg.SetCharacterStyle( sCharacterStyle ); @@ -319,6 +320,8 @@ IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl) SwFieldType* pType = (bCorrectFldName && !bNone) ? rSh.GetFldType( RES_SETEXPFLD, sFldTypeName ) : 0; + fprintf(stderr, "pType is %p\n", pType); + fprintf(stderr, "bCorrectFldName is %d\n", bCorrectFldName); m_pOKButton->Enable( bCorrectFldName && (!pType || ((SwSetExpFieldType*)pType)->GetType() == nsSwGetSetExpType::GSE_SEQ) ); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 08f31a4f2649..98ed59d65c0d 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -52,7 +52,12 @@ class TextFilterAutoConvert : public TextFilter { private: OUString m_sLastGoodText; + OUString m_sNone; public: + TextFilterAutoConvert(const OUString &rNone) + : m_sNone(rNone) + { + } virtual OUString filter(const OUString &rText) SAL_OVERRIDE; }; @@ -60,6 +65,7 @@ class SwCaptionDialog : public SvxStandardDialog { Edit* m_pTextEdit; ComboBox* m_pCategoryBox; + OUString m_sNone; TextFilterAutoConvert m_aTextFilter; FixedText* m_pFormatText; ListBox* m_pFormatBox; @@ -76,8 +82,6 @@ class SwCaptionDialog : public SvxStandardDialog SwCaptionPreview* m_pPreview; - OUString m_sNone; - SwView &rView; // search per active, avoid View SwFldMgr *pMgr; // pointer to save the include SelectionType eType; |