diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-03 09:30:44 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-16 20:29:18 +0000 |
| commit | 0489922093317cf55a5e12c0e4718d0c8ad7ac1a (patch) | |
| tree | 4b3967cb1b18c092ca6dde429806436e811be501 | |
| parent | f295adc5e5cc11134883a6d7dd50c1c8322c8139 (diff) | |
Resolves: tdf#94701 allow fully deleting illustration category in combobox
Change-Id: Iaaefbe2311e61be3b9689c693481d149aa1355f5
(cherry picked from commit 0261be7f92930952a470bc7f5e1d543b8907b1f0)
(cherry picked from commit 2365ff9f02370d63aae3d5b04b90b3c1a58d1094)
Reviewed-on: https://gerrit.libreoffice.org/20372
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index e97ef564f363..144bc080ed94 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; |