core.git: cui/source

[Andreas Heinisch (via logerrit)]

 cui/source/dialogs/cuihyperdlg.cxx |    6 +++---
 cui/source/dialogs/hltpbase.cxx    |    4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit bb42adb99a501a128a459b747b19134a5e804acb
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Fri Nov 8 11:52:49 2024 +0100
Commit:     Andreas Heinisch <andreas.heini...@yahoo.de>
CommitDate: Sun Nov 10 11:08:08 2024 +0100

    tdf#162753 - Propose clipboard content only for options internet and mail
    
    Change-Id: I11ac10ac4321f15cdd9f5096457f6ea4ab8204b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176269
    Reviewed-by: Andreas Heinisch <andreas.heini...@yahoo.de>
    Tested-by: Jenkins

diff --git a/cui/source/dialogs/cuihyperdlg.cxx 
b/cui/source/dialogs/cuihyperdlg.cxx
index 2270ab330f0b..41d5a17c4a7d 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -138,6 +138,9 @@ SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, 
SfxChildWindow* pChild, weld:
 
     SetInputSet (mpItemSet.get());
 
+    // tdf#90496 - remember last used view in hyperlink dialog
+    SetCurPageId(msRememberedPageId);
+
     // insert pages
     AddTabPage(u"internet"_ustr, SvxHyperlinkInternetTp::Create);
     AddTabPage(u"mail"_ustr, SvxHyperlinkMailTp::Create);
@@ -147,9 +150,6 @@ SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, 
SfxChildWindow* pChild, weld:
         AddTabPage(u"newdocument"_ustr, SvxHyperlinkNewDocTp::Create);
     }
 
-    // tdf#90496 - remember last used view in hyperlink dialog
-    SetCurPageId(msRememberedPageId);
-
     // Init Dialog
     Start();
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 12fd0b227a62..48b1e65d32ea 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -453,7 +453,9 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& 
rItemSet)
         OUString aStrURL(pHyperlinkItem->GetURL());
         // Store initial URL
         maStrInitURL = aStrURL;
-        if (aStrURL.isEmpty())
+        // tdf#162753 - propose clipboard content only for options internet 
and mail
+        if (aStrURL.isEmpty()
+            && (mpDialog->GetCurPageId() == "internet" || 
mpDialog->GetCurPageId() == "mail"))
         {
             if (auto xClipboard = GetSystemClipboard())
             {