From 693b7fcf7aef50ef6a55c170880f2854afd8fb12 Mon Sep 17 00:00:00 2001 From: Gökay Şatır Date: Wed, 14 Feb 2024 12:08:17 +0300 Subject: Revert hyperlinkInfoAtPositon changes. Revert "Implement hyperlinkInfoAtPosition for Impress." This reverts commit 876543305c78cb596720da087454a5c54e5feb06. Revert "Readonly Hyperlink Info - normalize the clicked coordinates." This reverts commit 322669725b771f5fa2b3c10c5fb73238ca3713f6. Revert "Implement hyperlinkInfoAtPosition function for Calc." This reverts commit be01dd78c47b51b19603a6259504e29b11979b0b. Revert "Implement hyperlinkInfoAtPosition for Writer." This reverts commit 6773c8929690f557d29bc282dd8f5c4381da3484. Revert "In readonly mode, we restrict many events like click." This reverts commit a4f3b97e506f38e0c43d6fbf1192cc523750a9fd. (cherry picked from commit c3f1d63178d6aaa0888085c7b641eb6d49a18276) Conflicts: sc/source/ui/unoobj/docuno.cxx sd/source/ui/unoidl/unomodel.cxx sw/source/uibase/uno/unotxdoc.cxx Change-Id: Ie821a4bca6e6b4649cea17748c44af105cd45d30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164481 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sc/inc/docuno.hxx | 3 --- sc/source/ui/unoobj/docuno.cxx | 18 ------------------ 2 files changed, 21 deletions(-) (limited to 'sc') diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index df37c0cef33e..5586ee4f8963 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -346,9 +346,6 @@ public: /// @see vcl::ITiledRenderable::setTextSelection(). virtual void setTextSelection(int nType, int nX, int nY) override; - /// @see vcl::ITiledRenderable::hyperlinkInfoAtPosition(). - virtual OUString hyperlinkInfoAtPosition(int x, int y) override; - /// @see vcl::ITiledRenderable::getSelection(). virtual css::uno::Reference getSelection() override; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 25a5ca8241f4..e80a3bbed259 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -920,24 +920,6 @@ void ScModelObj::setTextSelection(int nType, int nX, int nY) } } -OUString ScModelObj::hyperlinkInfoAtPosition(int x, int y) -{ - if (ScViewData* pViewData = ScDocShell::GetViewData()) - { - ScGridWindow* pGridWindow = pViewData->GetActiveWin(); - if (pGridWindow) - { - const Point point(x * pViewData->GetPPTX(), y * pViewData->GetPPTY()); - OUString name; - OUString url; - (void)pGridWindow->GetEditUrl(point, &name, &url); - return url; - } - } - - return OUString(); -} - uno::Reference ScModelObj::getSelection() { SolarMutexGuard aGuard; -- cgit