diff options
author | Niklas Johansson <sleeping.pillow@gmail.com> | 2015-01-15 14:43:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-19 16:27:40 +0000 |
commit | 7d6ddf18e6266825eb2aef47b41a461a5ac0baa6 (patch) | |
tree | a826b30dc14383d637d2cfe7da165d360d70f71b | |
parent | 45cf94410091478a09cc1eadc1b5510a5548ad15 (diff) |
fdo#86844 - CONTEXT MENU: Remove hyperlink not accessible
At the moment Remove hyperlink is only shown when text is selected
together with a hyperlink but not when you right click directly on
a link. Let's reuse the logic from when edit hyperlink should be shown
and append it to the currently working case where text and link is
selected.
Change-Id: I2524f1c3037f3101d24e592eadf2e7d5d66ab4f9
Reviewed-on: https://gerrit.libreoffice.org/13926
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4f4dcd527ee4ef7365389b5a70d0f199263628e7)
Reviewed-on: https://gerrit.libreoffice.org/13950
-rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 51d9a9d030aa..b4e845040b81 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1674,7 +1674,9 @@ void SwTextShell::GetState( SfxItemSet &rSet ) rSh.GetCurAttr(aSet); // If a hyperlink is selected, either alone or along with other text... - if(aSet.GetItemState( RES_TXTATR_INETFMT, true ) != SfxItemState::DONTCARE || rSh.HasReadonlySel()) + if ((aSet.GetItemState(RES_TXTATR_INETFMT, true) < SfxItemState::SET && + aSet.GetItemState(RES_TXTATR_INETFMT, true) != SfxItemState::DONTCARE) || + rSh.HasReadonlySel()) { rSet.DisableItem(nWhich); } |