summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-03 09:30:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-03 09:30:44 +0000
commit0261be7f92930952a470bc7f5e1d543b8907b1f0 (patch)
tree503fabc55210d9ff1c0307755a7839e7e9ebf4f5
parentafc565bf26464a4999b45d8bc57545fa1ff534e5 (diff)
Resolves: tdf#94701 allow fully deleting illustration category in combobox
Change-Id: Iaaefbe2311e61be3b9689c693481d149aa1355f5
-rw-r--r--sw/source/ui/frmdlg/cption.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 4f3509e00544..cc176df7bb43 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -83,10 +83,10 @@ public:
OUString SwCaptionDialog::our_aSepTextSave(": "); // Caption separator text
-//Resolves: fdo#47427 disallow typing *or* pasting content into the category box
+//Resolves: tdf#47427 disallow typing *or* pasting invalid content into the category box
OUString TextFilterAutoConvert::filter(const OUString &rText)
{
- if (rText != m_sNone && !SwCalc::IsValidVarName(rText))
+ if (!rText.isEmpty() && rText != m_sNone && !SwCalc::IsValidVarName(rText))
return m_sLastGoodText;
m_sLastGoodText = rText;
return rText;