diff options
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 15 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 21 |
2 files changed, 31 insertions, 5 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 007f3723b882..b6933d934182 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1145,18 +1145,24 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rReq.Done (); break; - case SID_SET_DEFAULT: + case SID_REMOVE_HYPERLINK: { - std::unique_ptr<SfxItemSet> pSet; - if (mpDrawView->IsTextEdit()) { - ::Outliner* pOutl = mpDrawView->GetTextEditOutliner(); + Outliner* pOutl = mpDrawView->GetTextEditOutliner(); if (pOutl) { pOutl->RemoveFields(checkSvxFieldData<SvxURLField>); } + } + } + break; + case SID_SET_DEFAULT: + { + std::unique_ptr<SfxItemSet> pSet; + if (mpDrawView->IsTextEdit()) + { pSet.reset(new SfxItemSet( GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} )); mpDrawView->SetAttributes( *pSet, true ); } @@ -1213,7 +1219,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( nLevel == 1 ) // text frame listens on StyleSheet of level1 pObj->NbcSetStyleSheet(pSheet, false); - } } } diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 7c48e20a95d8..0d5081cbfd17 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -482,6 +482,27 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } break; + case SID_REMOVE_HYPERLINK: + { + OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView(); + if (pOLV) + { + bool bField = false; + const SvxFieldItem* pFieldItem = pOLV->GetFieldUnderMousePointer(); + if (!pFieldItem) + pFieldItem = pOLV->GetFieldAtSelection(); + if (pFieldItem) + { + const SvxFieldData* pField = pFieldItem->GetField(); + if (dynamic_cast<const SvxURLField*>(pField)) + bField = true; + } + if (!bField) + rSet.DisableItem(nWhich); + } + } + break; + case SID_STYLE_WATERCAN: { std::unique_ptr<SfxPoolItem> pItem; |