Related: fdo#70571 say [ctrl+]click to follow link

as opposed to "hyperlink". Be more generic and consistent
across both ctrl+click and click modes.

Change-Id: I673ed59fc9f3408a0c4534c6490d9bbc3598bc08

sw/inc/shellres.hxx

@@ -64,7 +64,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     OUString        aTOXTablesName;
     OUString        aTOXAuthoritiesName;
 
-    OUString        aHyperlinkClick;
+    OUString        aLinkCtrlClick;
+    OUString        aLinkClick;
 
     std::vector<OUString> aDocInfoLst;
 

sw/source/core/draw/dpage.cxx

@@ -182,9 +182,9 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
                     bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
 
                     if ( !bExecHyperlinks )
-                    {
-                        sTxt = ViewShell::GetShellRes()->aHyperlinkClick + ": " + sTxt;
-                    }
+                        sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sTxt;
+                    else
+                        sTxt = ViewShell::GetShellRes()->aLinkClick + ": " + sTxt;
                 }
 
 

sw/source/ui/docvw/SidebarTxtControl.cxx

@@ -241,9 +241,9 @@ void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt )
                 OUString sURL( pURL->GetURL() );
                 SvtSecurityOptions aSecOpts;
                 if ( aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK) )
-                {
-                    sURL = ViewShell::GetShellRes()->aHyperlinkClick + ": " + sURL;
-                }
+                    sURL = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL;
+                else
+                    sURL = ViewShell::GetShellRes()->aLinkClick + ": " + sURL;
                 Help::ShowQuickHelp( this,PixelToLogic(Rectangle(GetPosPixel(),Size(50,10))),sURL);
             }
         }

sw/source/ui/docvw/edtwin2.cxx

@@ -217,11 +217,11 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     SvtSecurityOptions aSecOpts;
                     bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
 
-                    if ( !bExecHyperlinks )
-                    {
                     sTxt = ": " + sTxt;
-                        sTxt = ViewShell::GetShellRes()->aHyperlinkClick + sTxt;
-                    }
+                    if ( !bExecHyperlinks )
+                        sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + sTxt;
+                    else
+                        sTxt = ViewShell::GetShellRes()->aLinkClick + sTxt;
                 }
                 break;
             }

sw/source/ui/utlui/initui.cxx

@@ -204,7 +204,8 @@ ShellResource::ShellResource()
     aTOXObjectsName(        SW_RES(STR_TOX_OBJ)),
     aTOXTablesName(         SW_RES(STR_TOX_TBL)),
     aTOXAuthoritiesName(    SW_RES(STR_TOX_AUTH)),
-    aHyperlinkClick(SW_RESSTR(STR_HYPERLINK_CLICK)),
+    aLinkCtrlClick(SW_RESSTR(STR_LINK_CTRL_CLICK)),
+    aLinkClick(SW_RESSTR(STR_LINK_CLICK)),
     pAutoFmtNameLst(0),
     sPageDescFirstName(     SW_RES(STR_PAGEDESC_FIRSTNAME)),
     sPageDescFollowName(    SW_RES(STR_PAGEDESC_FOLLOWNAME)),
@@ -217,7 +218,7 @@ ShellResource::ShellResource()
     OUString aModStr( aModifiedCode.GetName() );
     aModStr = aModStr.replaceFirst(aCode.GetName(), OUString());
     aModStr = aModStr.replaceAll("+", OUString());
-    aHyperlinkClick = aHyperlinkClick.replaceAll("%s", aModStr);
+    aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr);
 
     for(sal_uInt16 i = 0; i < nCount; ++i)
         aDocInfoLst.push_back(OUString(SW_RESSTR(FLD_DOCINFO_BEGIN + i)));

sw/source/ui/utlui/initui.hrc

@@ -48,9 +48,10 @@
 #define STR_PAGEDESC_NAME           25
 #define STR_PAGEDESC_FIRSTNAME      26
 #define STR_PAGEDESC_FOLLOWNAME     27
-#define STR_HYPERLINK_CLICK         28
-#define STR_GETREFFLD_REFITEMNOTFOUND   29
-#define STR_DURATION_FORMAT             30
+#define STR_LINK_CTRL_CLICK         28
+#define STR_LINK_CLICK              29
+#define STR_GETREFFLD_REFITEMNOTFOUND   30
+#define STR_DURATION_FORMAT         31
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/ui/utlui/initui.src

@@ -133,11 +133,14 @@ Resource RID_SW_SHELLRES
     {
         Text [ en-US ] = "Illustration Index";
     };
-    String STR_HYPERLINK_CLICK
+    String STR_LINK_CTRL_CLICK
     {
-        Text [ en-US ] = "%s-click to open hyperlink";
+        Text [ en-US ] = "%s-Click to follow link";
+    };
+    String STR_LINK_CLICK
+    {
+        Text [ en-US ] = "Click to follow link";
     };
-
 
      // SubType DocInfo
      //