From d7947489a5d624adab6add560429235e357ac92d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 9 Feb 2015 10:43:28 +0000 Subject: Resolves: tdf#88933 Labeling of images impossible without category (cherry picked from commit 1fac71668ac8a32633a7ee31698c0f4fe78e4d31) Change-Id: I8b618d5cd6b3e9d5e42e04e215592a7b748dbb9f Reviewed-on: https://gerrit.libreoffice.org/14383 Tested-by: Michael Stahl Reviewed-by: Michael Stahl --- sw/source/ui/frmdlg/cption.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sw/source/ui') 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) ); -- cgit