sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2 +- sw/sdi/_drwbase.sdi | 6 ++++++ sw/source/uibase/shells/drwbassh.cxx | 14 ++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-)
New commits: commit 3c6b0322e2dc897bdd986afe0fe876a5d429528a Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Tue Jul 27 14:10:27 2021 +0200 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Tue Jul 27 16:19:17 2021 +0200 tdf#123626 Add "Open hyperlink" context menu to hyperlinked shapes Was missing in a23b44fd9f0119f7ea3523e32875f55c1a07c1cd Change-Id: Ifcee4af79a00c77206be4c2d5ff621f56f2d0018 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119551 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> diff --git a/sw/sdi/_drwbase.sdi b/sw/sdi/_drwbase.sdi index e90d50cb92fb..6c700380ed10 100644 --- a/sw/sdi/_drwbase.sdi +++ b/sw/sdi/_drwbase.sdi @@ -117,6 +117,12 @@ interface BaseTextDrawBase StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] + SID_OPEN_HYPERLINK + [ + ExecMethod = Execute ; + StateMethod = GetState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] SID_EDIT_HYPERLINK [ ExecMethod = Execute ; diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 29b7ec39a2a6..14c07162d711 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -605,6 +605,15 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq) break; } + case SID_OPEN_HYPERLINK: + { + const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); + SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); + LoadURL(GetShell(), pObj->getHyperlink(), LoadUrlFlags::NewView, + /*rTargetFrameName=*/OUString()); + break; + } + case SID_EDIT_HYPERLINK: case SID_HYPERLINK_DIALOG: { @@ -837,6 +846,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) } break; + case SID_OPEN_HYPERLINK: case SID_EDIT_HYPERLINK: case SID_HYPERLINK_DIALOG: case SID_REMOVE_HYPERLINK: @@ -844,8 +854,8 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) { if (pSdrView->GetMarkedObjectCount() != 1) rSet.DisableItem(nWhich); - else if (nWhich == SID_REMOVE_HYPERLINK || nWhich == SID_EDIT_HYPERLINK - || nWhich == SID_COPY_HYPERLINK_LOCATION) + else if (nWhich == SID_OPEN_HYPERLINK || nWhich == SID_REMOVE_HYPERLINK + || nWhich == SID_EDIT_HYPERLINK || nWhich == SID_COPY_HYPERLINK_LOCATION) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); commit cec95cd93ce002ff57e9a530ee920170f5d36e38 Author: Luboš Luňák <[email protected]> AuthorDate: Mon Jul 26 21:15:07 2021 +0200 Commit: Luboš Luňák <[email protected]> CommitDate: Tue Jul 27 16:19:06 2021 +0200 GooString::append(const std::string&) is new in poppler 0.83.0 Change-Id: Ib3324c393c195526160eddbdfc83a688e6f66dbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119534 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index e33fde7d2682..58fa1d61e969 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -444,7 +444,7 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) if( familyName != "" ) { aNewFont.familyName.clear(); -#if POPPLER_CHECK_VERSION(0, 74, 0) // at least 0.73 doesn't have GooString::append(const std::string&) +#if POPPLER_CHECK_VERSION(0, 83, 0) // GooString::append(const std::string&) aNewFont.familyName.append( familyName ); #else aNewFont.familyName.append( familyName.c_str() ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
