diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-25 17:33:45 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-11-26 08:19:23 +0000 |
| commit | ff35d252ff247c55c1004cce6676af8f881a2e68 (patch) | |
| tree | 70ba1c6055b0689132e230533236d9553baf4f64 /sw/inc | |
| parent | 8d6136206f26dbee773ffaea18a0f37c17e55024 (diff) | |
tdf#93837 Add UNO-based SmartTag menu controller
... and use it for the standalone context menu. The sfx2
controller (SvxSmartTagsControl) is still used for the
submenu variation, and is due to be removed after the new
context menu implementation is in place.
Change-Id: I2f889428eb777149f43d74cf3d081e19ab0ebb4a
Reviewed-on: https://gerrit.libreoffice.org/20169
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/crsrsh.hxx | 8 | ||||
| -rw-r--r-- | sw/inc/rcid.hrc | 5 | ||||
| -rw-r--r-- | sw/inc/view.hxx | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index d53a61064cc0..13d8c0c9b219 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -768,12 +768,8 @@ public: const SwPostItField* GetPostItFieldAtCursor() const; - // get smart tags at point position - void GetSmartTagTerm( const Point& rPt, - SwRect& rSelectRect, - css::uno::Sequence< OUString >& rSmartTagTypes, - css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps, - css::uno::Reference<css::text::XTextRange>& rRange ); + // get smart tags rectangle for the given point + void GetSmartTagRect( const Point& rPt, SwRect& rSelectRect ); // get smart tags at current cursor position void GetSmartTagTerm( css::uno::Sequence< OUString >& rSmartTagTypes, diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index 0af476262780..f80958807599 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -235,10 +235,7 @@ #define RC_ACCESS_END (RC_ACCESS + 99) // free: RC_UNDO to (RC_UNDO + 199) - -// Smarttags -#define RC_SMARTTAG_BEGIN RC_SMARTTAG -// RC_SMARTTAG_END (RC_SMARTTAG + 99) +// free: RC_SMARTTAG to (RC_SMARTTAG + 99) // unocore #define RC_UNOCORE_BEGIN RC_UNOCORE diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index a757d79a0234..bfb7b3d4bcd6 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -428,7 +428,7 @@ public: void SpellError(LanguageType eLang); bool ExecSpellPopup( const Point& rPt ); void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); - bool ExecSmartTagPopup( const Point& rPt ); + void ExecSmartTagPopup( const Point& rPt ); DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); bool ExecDrwTextSpellPopup(const Point& rPt); |